aboutsummaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2018-08-11 00:16:43 -0300
committerHisham Muhammad <hisham@gobolinux.org>2018-08-11 00:34:18 -0300
commit958d431a09b2ad0a5137695488692a14c9e533d6 (patch)
treeed36959b667e9ac26828023d08f42068f7da5d0b /GNUmakefile
parentbd640437b240796b0aae7ce168041afd206c5d9b (diff)
downloadluarocks-958d431a09b2ad0a5137695488692a14c9e533d6.tar.gz
luarocks-958d431a09b2ad0a5137695488692a14c9e533d6.tar.bz2
luarocks-958d431a09b2ad0a5137695488692a14c9e533d6.zip
Honor --force-config
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 86f965a7..90ceaf87 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -76,7 +76,9 @@ luarocks-admin: config.unix
76$(builddir)/luarocks: src/bin/luarocks config.unix 76$(builddir)/luarocks: src/bin/luarocks config.unix
77 mkdir -p "$(@D)" 77 mkdir -p "$(@D)"
78 (printf '$(SHEBANG)\n'\ 78 (printf '$(SHEBANG)\n'\
79 'package.loaded["luarocks.core.hardcoded"] = { SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\ 79 'package.loaded["luarocks.core.hardcoded"] = { '\
80 "$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
81 'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
80 'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \ 82 'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \
81 tail -n +2 src/bin/luarocks \ 83 tail -n +2 src/bin/luarocks \
82 )> "$@" 84 )> "$@"
@@ -84,7 +86,9 @@ $(builddir)/luarocks: src/bin/luarocks config.unix
84$(builddir)/luarocks-admin: src/bin/luarocks-admin config.unix 86$(builddir)/luarocks-admin: src/bin/luarocks-admin config.unix
85 mkdir -p "$(@D)" 87 mkdir -p "$(@D)"
86 (printf '$(SHEBANG)\n'\ 88 (printf '$(SHEBANG)\n'\
87 'package.loaded["luarocks.core.hardcoded"] = { SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\ 89 'package.loaded["luarocks.core.hardcoded"] = { '\
90 "$$([ -n "$(FORCE_CONFIG)" ] && printf 'FORCE_CONFIG = true, ')"\
91 'SYSCONFDIR = [[$(luarocksconfdir)]] }\n'\
88 'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \ 92 'package.path=[[$(luadir)/?.lua;]] .. package.path\n'; \
89 tail -n +2 src/bin/luarocks-admin \ 93 tail -n +2 src/bin/luarocks-admin \
90 )> "$@" 94 )> "$@"
@@ -97,11 +101,11 @@ binary: luarocks $(buildbinarydir)/luarocks.exe $(buildbinarydir)/luarocks-admin
97 101
98$(buildbinarydir)/luarocks.exe: src/bin/luarocks $(LUAROCKS_FILES) 102$(buildbinarydir)/luarocks.exe: src/bin/luarocks $(LUAROCKS_FILES)
99 (unset $(LUA_ENV_VARS); \ 103 (unset $(LUA_ENV_VARS); \
100 "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) 104 "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" "$(FORCE_CONFIG)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
101 105
102$(buildbinarydir)/luarocks-admin.exe: src/bin/luarocks-admin $(LUAROCKS_FILES) 106$(buildbinarydir)/luarocks-admin.exe: src/bin/luarocks-admin $(LUAROCKS_FILES)
103 (unset $(LUA_ENV_VARS); \ 107 (unset $(LUA_ENV_VARS); \
104 "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) 108 "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" "$(FORCE_CONFIG)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT))
105 109
106# ---------------------------------------- 110# ----------------------------------------
107# Regular install 111# Regular install