From a8a379fdc6bce08b7891e5c9fe0cbf3e3bc42d7b Mon Sep 17 00:00:00 2001 From: daurnimator Date: Sun, 5 Aug 2018 18:10:34 +1000 Subject: GNUmakefile: simplify build-binary targets --- GNUmakefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 97fada4d..45eb38b1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -118,15 +118,13 @@ uninstall: binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe -build-binary/luarocks.exe: luarocks +build-binary/luarocks.exe: src/bin/luarocks $(LUAROCKS_FILES) (unset $(LUA_ENV_VARS); \ - LUA_PATH="./src/?.lua;;" \ - "$(LUA)" binary/all_in_one "src/bin/luarocks" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) + "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) -build-binary/luarocks-admin.exe: luarocks +build-binary/luarocks-admin.exe: src/bin/luarocks-admin $(LUAROCKS_FILES) (unset $(LUA_ENV_VARS); \ - LUA_PATH="./src/?.lua;;" \ - "$(LUA)" binary/all_in_one "src/bin/luarocks-admin" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) + "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) # ---------------------------------------- # Binary install -- cgit v1.2.3-55-g6feb