aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2018-08-05 18:10:34 +1000
committerHisham Muhammad <hisham@gobolinux.org>2018-08-10 22:49:47 -0300
commita8a379fdc6bce08b7891e5c9fe0cbf3e3bc42d7b (patch)
tree705d737f644cd5741212a5bffd7ffd5e4e130d4f
parent2944a0bf20710144f58dd166374c6e48c66e2865 (diff)
downloadluarocks-a8a379fdc6bce08b7891e5c9fe0cbf3e3bc42d7b.tar.gz
luarocks-a8a379fdc6bce08b7891e5c9fe0cbf3e3bc42d7b.tar.bz2
luarocks-a8a379fdc6bce08b7891e5c9fe0cbf3e3bc42d7b.zip
GNUmakefile: simplify build-binary targets
-rw-r--r--GNUmakefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 97fada4d..45eb38b1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -118,15 +118,13 @@ uninstall:
118 118
119binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe 119binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe
120 120
121build-binary/luarocks.exe: luarocks 121build-binary/luarocks.exe: src/bin/luarocks $(LUAROCKS_FILES)
122 (unset $(LUA_ENV_VARS); \ 122 (unset $(LUA_ENV_VARS); \
123 LUA_PATH="./src/?.lua;;" \ 123 "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
124 "$(LUA)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
125 124
126build-binary/luarocks-admin.exe: luarocks 125build-binary/luarocks-admin.exe: src/bin/luarocks-admin $(LUAROCKS_FILES)
127 (unset $(LUA_ENV_VARS); \ 126 (unset $(LUA_ENV_VARS); \
128 LUA_PATH="./src/?.lua;;" \ 127 "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
129 "$(LUA)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
130 128
131# ---------------------------------------- 129# ----------------------------------------
132# Binary install 130# Binary install