--- texlive-2007/texk/make/paths.mk.orig	2007-06-19 17:21:27.832836187 -0400
+++ texlive-2007/texk/make/paths.mk	2007-06-19 17:19:45.255334695 -0400
@@ -44,10 +44,10 @@
 # corresponding changes to texmf.in or texmf.cnf yourself.
 
 # The root of the main tree.
-texmf = @texmfmain@
+texmf = $(datadir)/texmf
 
 # The directory used by varfonts.
-vartexfonts = /var/tmp/texfonts
+vartexfonts = $(localstatedir)/cache/fonts
 
 # Regular input files.
 texinputdir = $(texmf)/tex