2 files changed, 13 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index a72bdbcd..a96091ee 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,19 @@ config.unix:
         @exit 1
 
 config-$(LUA_VERSION).lua.in: config.unix
+        @printf -- '-- LuaRocks configuration\n\n'\
+        'rocks_trees = {\n'\
+        '   { name = "user", root = home .. "/.luarocks" };\n'\
+        '   { name = "system", root = "'"$(rocks_tree)"'" };\n'\
+        '}\n'\
+        "$$([ -n "$(LUA_INTERPRETER)" ] && printf 'lua_interpreter = "%s";\\n' "$(LUA_INTERPRETER)")"\
+        'variables = {\n'\
+        "$$([ -n "$(LUA_DIR)" ] && printf '   LUA_DIR = "%s";\\n' "$(LUA_DIR)")"\
+        "$$([ -n "$(LUA_INCDIR)" ] && printf '   LUA_INCDIR = "%s";\\n' "$(LUA_INCDIR)")"\
+        "$$([ -n "$(LUA_BINDIR)" ] && printf '   LUA_BINDIR = "%s";\\n' "$(LUA_BINDIR)")"\
+        "$$([ -n "$(LUA_LIBDIR)" ] && printf '   LUA_LIBDIR = "%s";\\n' "$(LUA_LIBDIR)")"\
+        '}\n'\
+        > $@
 
 luarocks: config.unix config-$(LUA_VERSION).lua.in
         rm -f src/luarocks/core/hardcoded.lua
diff --git a/configure b/configure
index a145e62c..9e096ae9 100755
--- a/configure
+++ b/configure
@@ -499,22 +499,6 @@ LUA_LIBDIR=$LUA_LIBDIR
 FORCE_CONFIG=$FORCE_CONFIG
 EOF
 
-{
-   echo '-- LuaRocks configuration'
-   echo
-   echo 'rocks_trees = {'
-   echo '   { name = "user", root = home .. "/.luarocks" },'
-   echo '   { name = "system", root = "'"$ROCKS_TREE"'" },'
-   echo '}'
-   if [ -n "$LUA_INTERPRETER" ]; then echo 'lua_interpreter = "'"$LUA_INTERPRETER"'"' ; fi
-   echo 'variables = {'
-   if [ -n "$LUA_DIR" ]; then echo '   LUA_DIR = "'"$LUA_DIR"'",' ; fi
-   if [ -n "$LUA_INCDIR" ]; then echo '   LUA_INCDIR = "'"$LUA_INCDIR"'",' ; fi
-   if [ -n "$LUA_BINDIR" ]; then echo '   LUA_BINDIR = "'"$LUA_BINDIR"'",' ; fi
-   if [ -n "$LUA_LIBDIR" ]; then echo '   LUA_LIBDIR = "'"$LUA_LIBDIR"'",' ; fi
-   echo '}'
-} > "config-$LUA_VERSION.lua.in"
-
 echo
 BLUE "Done configuring."
 echo