2016-04-30 19:04:00

1 files changed, 8 insertions, 4 deletions

diff --git a/tex/context/base/mkiv/data-pre.lua b/tex/context/base/mkiv/data-pre.lua
index 1c5016f86..70b2e7354 100644
--- a/tex/context/base/mkiv/data-pre.lua
+++ b/tex/context/base/mkiv/data-pre.lua
@@ -72,19 +72,23 @@ prefixes.pathname = function(str)
 end
 
 prefixes.selfautoloc = function(str)
-    return cleanpath(joinpath(getenv('SELFAUTOLOC'),str))
+    local pth = getenv('SELFAUTOLOC')
+    return cleanpath(str and joinpath(pth,str) or pth)
 end
 
 prefixes.selfautoparent = function(str)
-    return cleanpath(joinpath(getenv('SELFAUTOPARENT'),str))
+    local pth = getenv('SELFAUTOPARENT')
+    return cleanpath(str and joinpath(pth,str) or pth)
 end
 
 prefixes.selfautodir = function(str)
-    return cleanpath(joinpath(getenv('SELFAUTODIR'),str))
+    local pth = getenv('SELFAUTODIR')
+    return cleanpath(str and joinpath(pth,str) or pth)
 end
 
 prefixes.home = function(str)
-    return cleanpath(joinpath(getenv('HOME'),str))
+    local pth = getenv('HOME')
+    return cleanpath(str and joinpath(pth,str) or pth)
 end
 
 prefixes.env  = prefixes.environment