diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-17 15:51:02 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-07-18 11:24:07 -0300 |
| commit | d3ff6711ad4e97130669cdb570583ecda97fa2bf (patch) | |
| tree | 0ae3290adf43df32f092bd992a5d60149f6f3962 | |
| parent | 6f424e70ba3a206987095f8c6ec88f28e30b51f2 (diff) | |
| download | luarocks-d3ff6711ad4e97130669cdb570583ecda97fa2bf.tar.gz luarocks-d3ff6711ad4e97130669cdb570583ecda97fa2bf.tar.bz2 luarocks-d3ff6711ad4e97130669cdb570583ecda97fa2bf.zip | |
Makefile: remove ./ from build targets
Improves compatibility with FreeBSD
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | 1 | ||
| 2 | -include config.unix | 2 | -include config.unix |
| 3 | 3 | ||
| 4 | all: ./luarocks ./luarocks-admin | 4 | all: luarocks luarocks-admin |
| 5 | 5 | ||
| 6 | # ---------------------------------------- | 6 | # ---------------------------------------- |
| 7 | # Base build | 7 | # Base build |
| @@ -16,7 +16,7 @@ config.unix: | |||
| 16 | 16 | ||
| 17 | config-$(LUA_VERSION).lua.in: config.unix | 17 | config-$(LUA_VERSION).lua.in: config.unix |
| 18 | 18 | ||
| 19 | ./luarocks: config.unix config-$(LUA_VERSION).lua.in | 19 | 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 |
| @@ -68,10 +68,10 @@ BINARY_TARGET=build-binary | |||
| 68 | 68 | ||
| 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/" "$(SYSCONFDIR)" $(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/" "$(SYSCONFDIR)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT) |
| 76 | 76 | ||
| 77 | # ---------------------------------------- | 77 | # ---------------------------------------- |
| @@ -92,14 +92,14 @@ install-binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe | |||
| 92 | # Bootstrap install | 92 | # Bootstrap install |
| 93 | # ---------------------------------------- | 93 | # ---------------------------------------- |
| 94 | 94 | ||
| 95 | bootstrap: ./luarocks $(SYSCONFDIR)/config-$(LUA_VERSION).lua | 95 | bootstrap: luarocks $(SYSCONFDIR)/config-$(LUA_VERSION).lua |
| 96 | ./luarocks make --tree="$(ROCKS_TREE)" | 96 | ./luarocks make --tree="$(ROCKS_TREE)" |
| 97 | 97 | ||
| 98 | # ---------------------------------------- | 98 | # ---------------------------------------- |
| 99 | # Windows binary build | 99 | # Windows binary build |
| 100 | # ---------------------------------------- | 100 | # ---------------------------------------- |
| 101 | 101 | ||
| 102 | windows-binary: ./luarocks | 102 | windows-binary: luarocks |
| 103 | make -f binary/Makefile.windows windows-binary | 103 | make -f binary/Makefile.windows windows-binary |
| 104 | 104 | ||
| 105 | windows-clean: | 105 | windows-clean: |