From 8977c175a64fab7e9bd700ca8eb52c401e1f5cfd Mon Sep 17 00:00:00 2001 From: daurnimator Date: Sun, 5 Aug 2018 11:21:28 +1000 Subject: prefix and sysconfdir are traditionally lowercase, add luarocksconfdir --- Makefile | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'Makefile') 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 - mkdir -p "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks" - cp -a src/luarocks/* "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks" +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" + cp -a src/luarocks/* "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks" -$(DESTDIR)$(PREFIX)/bin/luarocks: src/bin/luarocks config.unix - mkdir -p "$(DESTDIR)$(PREFIX)/bin" +$(DESTDIR)$(prefix)/bin/luarocks: src/bin/luarocks config.unix + mkdir -p "$(DESTDIR)$(prefix)/bin" echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@ - echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@ - echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@ + echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(luarocksconfdir)]] }" >> $@ + 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 - mkdir -p "$(DESTDIR)$(PREFIX)/bin" +$(DESTDIR)$(prefix)/bin/luarocks-admin: src/bin/luarocks-admin config.unix + mkdir -p "$(DESTDIR)$(prefix)/bin" echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@ - echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@ - echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@ + echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(luarocksconfdir)]] }" >> $@ + 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 - mkdir -p "$(DESTDIR)$(SYSCONFDIR)" - cp config-$(LUA_VERSION).lua.in "$(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua" +$(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua: config-$(LUA_VERSION).lua.in + mkdir -p "$(DESTDIR)$(luarocksconfdir)" + 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" - cp build-binary/luarocks.exe "$(DESTDIR)$(PREFIX)/bin/luarocks" - chmod +rx "$(DESTDIR)$(PREFIX)/bin/luarocks" - cp build-binary/luarocks-admin.exe "$(DESTDIR)$(PREFIX)/bin/luarocks-admin" - chmod +rx "$(DESTDIR)$(PREFIX)/bin/luarocks-admin" - 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/loader.lua "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/" + mkdir -p "$(DESTDIR)$(prefix)/bin" + cp build-binary/luarocks.exe "$(DESTDIR)$(prefix)/bin/luarocks" + chmod +rx "$(DESTDIR)$(prefix)/bin/luarocks" + cp build-binary/luarocks-admin.exe "$(DESTDIR)$(prefix)/bin/luarocks-admin" + chmod +rx "$(DESTDIR)$(prefix)/bin/luarocks-admin" + 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/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)" # ---------------------------------------- -- cgit v1.2.3-55-g6feb