1 files changed, 27 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index 93ffbdb6..5848128a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ luarocks: config.unix config-$(LUA_VERSION).lua.in
        rm -f src/luarocks/core/hardcoded.lua
        echo "#!/bin/sh" > luarocks
        echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks
-        echo 'LUAROCKS_SYSCONFDIR="$(SYSCONFDIR)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks
+        echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks
        chmod +rx ./luarocks
        ./luarocks init
        cp config-$(LUA_VERSION).lua.in .luarocks/config-$(LUA_VERSION).lua
@@ -29,36 +29,36 @@ luarocks-admin: config.unix
        rm -f src/luarocks/core/hardcoded.lua
        echo "#!/bin/sh" > luarocks-admin
        echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks-admin
-        echo 'LUAROCKS_SYSCONFDIR="$(SYSCONFDIR)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin
+        echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin
        chmod +rx ./luarocks-admin
 # ----------------------------------------
 # Regular install
 # ----------------------------------------
-install: all $(DESTDIR)$(PREFIX)/bin/luarocks $(DESTDIR)$(PREFIX)/bin/luarocks-admin $(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua
+install: all $(DESTDIR)$(prefix)/bin/luarocks $(DESTDIR)$(prefix)/bin/luarocks-admin $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
-        mkdir -p "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks"
+        mkdir -p "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
-        cp -a src/luarocks/* "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks"
+        cp -a src/luarocks/* "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
-$(DESTDIR)$(PREFIX)/bin/luarocks: src/bin/luarocks config.unix
+$(DESTDIR)$(prefix)/bin/luarocks: src/bin/luarocks config.unix
-        mkdir -p "$(DESTDIR)$(PREFIX)/bin"
+        mkdir -p "$(DESTDIR)$(prefix)/bin"
        echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@
-        echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@
+        echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(luarocksconfdir)]] }" >> $@
-        echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
+        echo "package.path=[[$(prefix)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
        tail -n +2 src/bin/luarocks >> $@
        chmod +rx $@
-$(DESTDIR)$(PREFIX)/bin/luarocks-admin: src/bin/luarocks-admin config.unix
+$(DESTDIR)$(prefix)/bin/luarocks-admin: src/bin/luarocks-admin config.unix
-        mkdir -p "$(DESTDIR)$(PREFIX)/bin"
+        mkdir -p "$(DESTDIR)$(prefix)/bin"
        echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@
-        echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@
+        echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(luarocksconfdir)]] }" >> $@
-        echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
+        echo "package.path=[[$(prefix)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
        tail -n +2 src/bin/luarocks-admin >> $@
        chmod +rx $@
-$(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua: config-$(LUA_VERSION).lua.in
+$(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua: config-$(LUA_VERSION).lua.in
-        mkdir -p "$(DESTDIR)$(SYSCONFDIR)"
+        mkdir -p "$(DESTDIR)$(luarocksconfdir)"
-        cp config-$(LUA_VERSION).lua.in "$(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua"
+        cp config-$(LUA_VERSION).lua.in "$(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua"
 # ----------------------------------------
 # Binary build
@@ -69,30 +69,30 @@ BINARY_TARGET=build-binary
 binary: $(BINARY_TARGET)/luarocks.exe $(BINARY_TARGET)/luarocks-admin.exe
 $(BINARY_TARGET)/luarocks.exe: luarocks
-        LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(SYSCONFDIR)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)
+        LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)
 $(BINARY_TARGET)/luarocks-admin.exe: luarocks
-        LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(SYSCONFDIR)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)
+        LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)
 # ----------------------------------------
 # Binary install
 # ----------------------------------------
 install-binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe
-        mkdir -p "$(DESTDIR)$(PREFIX)/bin"
+        mkdir -p "$(DESTDIR)$(prefix)/bin"
-        cp build-binary/luarocks.exe "$(DESTDIR)$(PREFIX)/bin/luarocks"
+        cp build-binary/luarocks.exe "$(DESTDIR)$(prefix)/bin/luarocks"
-        chmod +rx "$(DESTDIR)$(PREFIX)/bin/luarocks"
+        chmod +rx "$(DESTDIR)$(prefix)/bin/luarocks"
-        cp build-binary/luarocks-admin.exe "$(DESTDIR)$(PREFIX)/bin/luarocks-admin"
+        cp build-binary/luarocks-admin.exe "$(DESTDIR)$(prefix)/bin/luarocks-admin"
-        chmod +rx "$(DESTDIR)$(PREFIX)/bin/luarocks-admin"
+        chmod +rx "$(DESTDIR)$(prefix)/bin/luarocks-admin"
-        mkdir -p "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/core"
+        mkdir -p "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks/core"
-        cp -a src/luarocks/core/* "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/core"
+        cp -a src/luarocks/core/* "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks/core"
-        cp -a src/luarocks/loader.lua "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/"
+        cp -a src/luarocks/loader.lua "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks/"
 # ----------------------------------------
 # Bootstrap install
 # ----------------------------------------
-bootstrap: luarocks $(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua
+bootstrap: luarocks $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
        ./luarocks make --tree="$(DESTDIR)$(ROCKS_TREE)"
 # ----------------------------------------

diff --git a/Makefile b/Makefile index 93ffbdb6..5848128a 100644 --- a/Makefile +++ b/Makefile
@@ -20,7 +20,7 @@ luarocks: config.unix config-$(LUA_VERSION).lua.in
20	rm -f src/luarocks/core/hardcoded.lua	20	rm -f src/luarocks/core/hardcoded.lua
21	echo "#!/bin/sh" > luarocks	21	echo "#!/bin/sh" > luarocks
22	echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks	22	echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks
23	echo 'LUAROCKS_SYSCONFDIR="$(SYSCONFDIR)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks	23	echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks
24	chmod +rx ./luarocks	24	chmod +rx ./luarocks
25	./luarocks init	25	./luarocks init
26	cp config-$(LUA_VERSION).lua.in .luarocks/config-$(LUA_VERSION).lua	26	cp config-$(LUA_VERSION).lua.in .luarocks/config-$(LUA_VERSION).lua
@@ -29,36 +29,36 @@ luarocks-admin: config.unix
29	rm -f src/luarocks/core/hardcoded.lua	29	rm -f src/luarocks/core/hardcoded.lua
30	echo "#!/bin/sh" > luarocks-admin	30	echo "#!/bin/sh" > luarocks-admin
31	echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks-admin	31	echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks-admin
32	echo 'LUAROCKS_SYSCONFDIR="$(SYSCONFDIR)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin	32	echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks-admin" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks-admin
33	chmod +rx ./luarocks-admin	33	chmod +rx ./luarocks-admin
34		34
35	# ----------------------------------------	35	# ----------------------------------------
36	# Regular install	36	# Regular install
37	# ----------------------------------------	37	# ----------------------------------------
38		38
39	install: all $(DESTDIR)$(PREFIX)/bin/luarocks $(DESTDIR)$(PREFIX)/bin/luarocks-admin $(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua	39	install: all $(DESTDIR)$(prefix)/bin/luarocks $(DESTDIR)$(prefix)/bin/luarocks-admin $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
40	mkdir -p "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks"	40	mkdir -p "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
41	cp -a src/luarocks/* "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks"	41	cp -a src/luarocks/* "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
42		42
43	$(DESTDIR)$(PREFIX)/bin/luarocks: src/bin/luarocks config.unix	43	$(DESTDIR)$(prefix)/bin/luarocks: src/bin/luarocks config.unix
44	mkdir -p "$(DESTDIR)$(PREFIX)/bin"	44	mkdir -p "$(DESTDIR)$(prefix)/bin"
45	echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@	45	echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@
46	echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@	46	echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(luarocksconfdir)]] }" >> $@
47	echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@	47	echo "package.path=[[$(prefix)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
48	tail -n +2 src/bin/luarocks >> $@	48	tail -n +2 src/bin/luarocks >> $@
49	chmod +rx $@	49	chmod +rx $@
50		50
51	$(DESTDIR)$(PREFIX)/bin/luarocks-admin: src/bin/luarocks-admin config.unix	51	$(DESTDIR)$(prefix)/bin/luarocks-admin: src/bin/luarocks-admin config.unix
52	mkdir -p "$(DESTDIR)$(PREFIX)/bin"	52	mkdir -p "$(DESTDIR)$(prefix)/bin"
53	echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@	53	echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@
54	echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@	54	echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(luarocksconfdir)]] }" >> $@
55	echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@	55	echo "package.path=[[$(prefix)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
56	tail -n +2 src/bin/luarocks-admin >> $@	56	tail -n +2 src/bin/luarocks-admin >> $@
57	chmod +rx $@	57	chmod +rx $@
58		58
59	$(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua: config-$(LUA_VERSION).lua.in	59	$(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua: config-$(LUA_VERSION).lua.in
60	mkdir -p "$(DESTDIR)$(SYSCONFDIR)"	60	mkdir -p "$(DESTDIR)$(luarocksconfdir)"
61	cp config-$(LUA_VERSION).lua.in "$(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua"	61	cp config-$(LUA_VERSION).lua.in "$(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua"
62		62
63	# ----------------------------------------	63	# ----------------------------------------
64	# Binary build	64	# Binary build
@@ -69,30 +69,30 @@ BINARY_TARGET=build-binary
69	binary: $(BINARY_TARGET)/luarocks.exe $(BINARY_TARGET)/luarocks-admin.exe	69	binary: $(BINARY_TARGET)/luarocks.exe $(BINARY_TARGET)/luarocks-admin.exe
70		70
71	$(BINARY_TARGET)/luarocks.exe: luarocks	71	$(BINARY_TARGET)/luarocks.exe: luarocks
72	LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(SYSCONFDIR)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)	72	LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)
73		73
74	$(BINARY_TARGET)/luarocks-admin.exe: luarocks	74	$(BINARY_TARGET)/luarocks-admin.exe: luarocks
75	LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(SYSCONFDIR)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)	75	LUA_PATH="$(CURDIR)/src/?.lua;;" "$(LUA_BINDIR)/$(LUA_INTERPRETER)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)
76		76
77	# ----------------------------------------	77	# ----------------------------------------
78	# Binary install	78	# Binary install
79	# ----------------------------------------	79	# ----------------------------------------
80		80
81	install-binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe	81	install-binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe
82	mkdir -p "$(DESTDIR)$(PREFIX)/bin"	82	mkdir -p "$(DESTDIR)$(prefix)/bin"
83	cp build-binary/luarocks.exe "$(DESTDIR)$(PREFIX)/bin/luarocks"	83	cp build-binary/luarocks.exe "$(DESTDIR)$(prefix)/bin/luarocks"
84	chmod +rx "$(DESTDIR)$(PREFIX)/bin/luarocks"	84	chmod +rx "$(DESTDIR)$(prefix)/bin/luarocks"
85	cp build-binary/luarocks-admin.exe "$(DESTDIR)$(PREFIX)/bin/luarocks-admin"	85	cp build-binary/luarocks-admin.exe "$(DESTDIR)$(prefix)/bin/luarocks-admin"
86	chmod +rx "$(DESTDIR)$(PREFIX)/bin/luarocks-admin"	86	chmod +rx "$(DESTDIR)$(prefix)/bin/luarocks-admin"
87	mkdir -p "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/core"	87	mkdir -p "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks/core"
88	cp -a src/luarocks/core/* "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/core"	88	cp -a src/luarocks/core/* "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks/core"
89	cp -a src/luarocks/loader.lua "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/"	89	cp -a src/luarocks/loader.lua "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks/"
90		90
91	# ----------------------------------------	91	# ----------------------------------------
92	# Bootstrap install	92	# Bootstrap install
93	# ----------------------------------------	93	# ----------------------------------------
94		94
95	bootstrap: luarocks $(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua	95	bootstrap: luarocks $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
96	./luarocks make --tree="$(DESTDIR)$(ROCKS_TREE)"	96	./luarocks make --tree="$(DESTDIR)$(ROCKS_TREE)"
97		97
98	# ----------------------------------------	98	# ----------------------------------------