--- texmf/web2c/texmfcnf.lua.old	2012-07-26 10:58:15.984959743 -0400
+++ texmf/web2c/texmfcnf.lua	2012-07-26 11:03:03.998622207 -0400
@@ -30,7 +30,7 @@
             -- most cases you can leve this one untouched. The built-in definition
             -- permits relocation of the tree.
             --
-            -- TEXMFCNF     = "{selfautodir:,selfautoparent:}{,{/share,}/texmf{-local,}/web2c}"
+            -- TEXMFCNF     = "selfautodir:/share/texmf/web2c"
             --
             -- more readable than "selfautoparent:{/texmf{-local,}{,/web2c},}}" is:
             --
@@ -44,14 +44,14 @@
 
             -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
 
-            TEXMFSYSVAR     = "selfautoparent:texmf-var",
-            TEXMFVAR        = "home:.texlive2012/texmf-var",
+            TEXMFSYSVAR     = "selfautodir:/../var/lib/texmf",
+            TEXMFVAR        = "home:.texlive/texmf-var",
 
             -- We have only one cache path but there can be more. The first writable one
             -- will be chosen but there can be more readable paths.
 
             TEXMFCACHE      = "$TEXMFSYSVAR;$TEXMFVAR",
-            TEXMFCONFIG     = "home:.texlive2012/texmf-config",
+            TEXMFCONFIG     = "home:.texlive/texmf-config",
 
             -- I don't like this texmf under home and texmf-home would make more
             -- sense. One never knows what installers put under texmf anywhere and
@@ -62,13 +62,13 @@
             -- entry. This makes the tex root relocatable.
 
             TEXMFOS         = "selfautodir:",
-            TEXMFMAIN       = "selfautoparent:texmf",
-            TEXMFDIST       = "selfautoparent:texmf-dist",
+            TEXMFMAIN       = "selfautodir:share/texmf",
+            TEXMFDIST       = "selfautoparent:share/texmf-dist",
 
-            TEXMFLOCAL      = texmflocal,
-            TEXMFSYSCONFIG  = "selfautoparent:texmf-config",
-            TEXMFFONTS      = "selfautoparent:texmf-fonts",
-            TEXMFPROJECT    = "selfautoparent:texmf-project",
+            TEXMFLOCAL      = "selfautodir:local/share/texmf",
+            TEXMFSYSCONFIG  = "selfautodir:/../etc/texmf",
+            TEXMFFONTS      = "selfautodir:share/texmf-dist",
+            TEXMFPROJECT    = "selfautodir:share/texmf-dist",
 
             TEXMFHOME       = "home:texmf",
          -- TEXMFHOME       = os.name == "macosx" and "home:Library/texmf" or "home:texmf",