Merge changes proposed by @siffiejoe in #172.

(Sorry about the clumsiness of not doing a proper merge.)

4 files changed, 17 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index 8933d8aa..3b0334c8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
-# $Id: Makefile,v 1.30 2008/08/18 14:07:35 hisham Exp $
 
 include config.unix
 
+.PHONY: all build dev build_bins luadoc check_makefile cleanup_bins clean \
+ install_bins install_luas install_site_config write_sysconfig \
+ install bootstrap install_rock
+
 DESTDIR =
 PREFIX ?= /usr/local
 ROCKS_TREE ?= $(PREFIX)
@@ -34,7 +37,10 @@ all:
         @echo "  to install LuaRocks in $(PREFIX) as a rock."
         @echo
 
-build: built
+build: src/luarocks/site_config.lua build_bins
+        @echo
+        @echo "Done. Type 'make install' to install into $(PREFIX)."
+        @echo
 
 src/luarocks/site_config.lua: config.unix
         rm -f src/luarocks/site_config.lua
@@ -97,18 +103,12 @@ build_bins: cleanup_bins
         do \
            sed "1d" src/bin/$$f > src/bin/$$f.bak ;\
            echo "#!$(LUA_BINDIR)/lua$(LUA_SUFFIX)" > src/bin/$$f ;\
-           echo "package.path = [[$(LUADIR)/?.lua;$(LUADIR)/?/init.lua;]]..package.path" >> src/bin/$$f ;\
+           echo "package.path = [[$(LUADIR)/?.lua;]]..package.path" | sed "s,//,/,g" >> src/bin/$$f ;\
            cat src/bin/$$f.bak >> src/bin/$$f ;\
            chmod +x src/bin/$$f ;\
            rm -f src/bin/$$f.bak ;\
         done
 
-built: src/luarocks/site_config.lua build_bins
-        touch built
-        @echo
-        @echo "Done. Type 'make install' to install into $(PREFIX)."
-        @echo
-
 luadoc:
         rm -rf doc/luadoc
         mkdir -p doc/luadoc
@@ -136,9 +136,8 @@ cleanup_bins:
 
 clean: cleanup_bins
         rm -f src/luarocks/site_config.lua
-        rm -f built
 
-install_bins: built
+install_bins:
         mkdir -p "$(DESTDIR)$(BINDIR)"
         cd src/bin && for f in $(BIN_FILES); \
         do \
@@ -146,7 +145,7 @@ install_bins: built
            ln -nfs "$$f-$(LUA_VERSION)" "$(DESTDIR)$(BINDIR)/$$f"; \
         done
 
-install_luas: built
+install_luas:
         mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"
         cd src/luarocks && for f in $(LUAROCKS_FILES); \
         do \
@@ -155,11 +154,11 @@ install_luas: built
            cp "$$f" "$$d" || exit 1; \
         done
 
-install_site_config: built
+install_site_config: src/luarocks/site_config.lua
         mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"
-        cd src/luarocks && cp site_config.lua "$(DESTDIR)$(LUADIR)/luarocks"
+        cp src/luarocks/site_config.lua "$(DESTDIR)$(LUADIR)/luarocks"
 
-write_sysconfig: built
+write_sysconfig:
         mkdir -p "$(DESTDIR)$(ROCKS_TREE)"
         if [ ! -f "$(DESTDIR)$(CONFIG_FILE)" ] ;\
         then \
@@ -175,7 +174,7 @@ write_sysconfig: built
 
 install: install_bins install_luas install_site_config write_sysconfig
 
-bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig
+bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig cleanup_bins
         '$(LUA_BINDIR)/lua$(LUA_SUFFIX)' -e "package.path=[[$(SAFEPWD)/src/?.lua;]]..package.path" src/bin/luarocks make rockspec --tree="$(PREFIX)"
 
 install_rock: install_bins install_luas
diff --git a/src/bin/luarocks b/src/bin/luarocks
index e28b17b8..6ab27fa3 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -1,5 +1,6 @@
 #!/usr/bin/env lua
 
+local loader = require("luarocks.loader")
 local command_line = require("luarocks.command_line")
 
 program_description = "LuaRocks main command-line interface"
diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin
index 4c5613ca..983dda87 100755
--- a/src/bin/luarocks-admin
+++ b/src/bin/luarocks-admin
@@ -1,5 +1,6 @@
 #!/usr/bin/env lua
 
+local loader = require("luarocks.loader")
 local command_line = require("luarocks.command_line")
 
 program_description = "LuaRocks repository administration interface"
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 86d7d585..e3d924fb 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -493,12 +493,6 @@ function package_paths()
    return table.concat(new_path, ";"), table.concat(new_cpath, ";")
 end
 
-do
-   local new_path, new_cpath = package_paths()
-   package.path = new_path..";"..package.path
-   package.cpath = new_cpath..";"..package.cpath
-end
-
 function which_config()
    return sys_config_file, sys_config_ok, home_config_file, home_config_ok
 end