summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2018-08-05 11:21:28 +1000
committerHisham Muhammad <hisham@gobolinux.org>2018-08-10 16:52:18 -0300
commit8977c175a64fab7e9bd700ca8eb52c401e1f5cfd (patch)
tree5aae60b973bb618805df06ce07cd1a37bd4376af
parenta1ebb128314a092deb3ef0ce903111640b5bc77a (diff)
downloadluarocks-8977c175a64fab7e9bd700ca8eb52c401e1f5cfd.tar.gz
luarocks-8977c175a64fab7e9bd700ca8eb52c401e1f5cfd.tar.bz2
luarocks-8977c175a64fab7e9bd700ca8eb52c401e1f5cfd.zip
prefix and sysconfdir are traditionally lowercase, add luarocksconfdir
Diffstat
-rw-r--r--Makefile54
-rwxr-xr-xconfigure61
2 files changed, 65 insertions, 50 deletions
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
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
23 echo 'LUAROCKS_SYSCONFDIR="$(SYSCONFDIR)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks 23 echo 'LUAROCKS_SYSCONFDIR="$(luarocksconfdir)" LUA_PATH="$(CURDIR)/src/?.lua;;" exec "$(LUA_BINDIR)/$(LUA_INTERPRETER)" "$(CURDIR)/src/bin/luarocks" --project-tree="$(CURDIR)/lua_modules" "$$@"' >> luarocks
24 chmod +rx ./luarocks 24 chmod +rx ./luarocks
25 ./luarocks init 25 ./luarocks init
26 cp config-$(LUA_VERSION).lua.in .luarocks/config-$(LUA_VERSION).lua 26 cp config-$(LUA_VERSION).lua.in .luarocks/config-$(LUA_VERSION).lua
@@ -29,36 +29,36 @@ luarocks-admin: config.unix
29 rm -f src/luarocks/core/hardcoded.lua 29 rm -f src/luarocks/core/hardcoded.lua
30 echo "#!/bin/sh" > luarocks-admin 30 echo "#!/bin/sh" > luarocks-admin
31 echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks-admin 31 echo "unset LUA_PATH LUA_PATH_5_2 LUA_PATH_5_3 LUA_PATH_5_4" >> luarocks-admin
32 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 32 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
33 chmod +rx ./luarocks-admin 33 chmod +rx ./luarocks-admin
34 34
35# ---------------------------------------- 35# ----------------------------------------
36# Regular install 36# Regular install
37# ---------------------------------------- 37# ----------------------------------------
38 38
39install: all $(DESTDIR)$(PREFIX)/bin/luarocks $(DESTDIR)$(PREFIX)/bin/luarocks-admin $(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua 39install: all $(DESTDIR)$(prefix)/bin/luarocks $(DESTDIR)$(prefix)/bin/luarocks-admin $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
40 mkdir -p "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks" 40 mkdir -p "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
41 cp -a src/luarocks/* "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks" 41 cp -a src/luarocks/* "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks"
42 42
43$(DESTDIR)$(PREFIX)/bin/luarocks: src/bin/luarocks config.unix 43$(DESTDIR)$(prefix)/bin/luarocks: src/bin/luarocks config.unix
44 mkdir -p "$(DESTDIR)$(PREFIX)/bin" 44 mkdir -p "$(DESTDIR)$(prefix)/bin"
45 echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@ 45 echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@
46 echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@ 46 echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(luarocksconfdir)]] }" >> $@
47 echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@ 47 echo "package.path=[[$(prefix)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
48 tail -n +2 src/bin/luarocks >> $@ 48 tail -n +2 src/bin/luarocks >> $@
49 chmod +rx $@ 49 chmod +rx $@
50 50
51$(DESTDIR)$(PREFIX)/bin/luarocks-admin: src/bin/luarocks-admin config.unix 51$(DESTDIR)$(prefix)/bin/luarocks-admin: src/bin/luarocks-admin config.unix
52 mkdir -p "$(DESTDIR)$(PREFIX)/bin" 52 mkdir -p "$(DESTDIR)$(prefix)/bin"
53 echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@ 53 echo "#!$(LUA_BINDIR)/$(LUA_INTERPRETER)" > $@
54 echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(SYSCONFDIR)]] }" >> $@ 54 echo "package.loaded['luarocks.core.hardcoded'] = { SYSCONFDIR = [[$(luarocksconfdir)]] }" >> $@
55 echo "package.path=[[$(PREFIX)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@ 55 echo "package.path=[[$(prefix)/share/lua/$(LUA_VERSION)/?.lua;]] .. package.path" >> $@
56 tail -n +2 src/bin/luarocks-admin >> $@ 56 tail -n +2 src/bin/luarocks-admin >> $@
57 chmod +rx $@ 57 chmod +rx $@
58 58
59$(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua: config-$(LUA_VERSION).lua.in 59$(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua: config-$(LUA_VERSION).lua.in
60 mkdir -p "$(DESTDIR)$(SYSCONFDIR)" 60 mkdir -p "$(DESTDIR)$(luarocksconfdir)"
61 cp config-$(LUA_VERSION).lua.in "$(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua" 61 cp config-$(LUA_VERSION).lua.in "$(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua"
62 62
63# ---------------------------------------- 63# ----------------------------------------
64# Binary build 64# Binary build
@@ -69,30 +69,30 @@ BINARY_TARGET=build-binary
69binary: $(BINARY_TARGET)/luarocks.exe $(BINARY_TARGET)/luarocks-admin.exe 69binary: $(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/" "$(luarocksconfdir)" $(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/" "$(luarocksconfdir)" $(BINARY_TARGET) $(BINARY_PLATFORM) $(BINARY_CC) $(BINARY_NM) $(BINARY_SYSROOT)
76 76
77# ---------------------------------------- 77# ----------------------------------------
78# Binary install 78# Binary install
79# ---------------------------------------- 79# ----------------------------------------
80 80
81install-binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe 81install-binary: build-binary/luarocks.exe build-binary/luarocks-admin.exe
82 mkdir -p "$(DESTDIR)$(PREFIX)/bin" 82 mkdir -p "$(DESTDIR)$(prefix)/bin"
83 cp build-binary/luarocks.exe "$(DESTDIR)$(PREFIX)/bin/luarocks" 83 cp build-binary/luarocks.exe "$(DESTDIR)$(prefix)/bin/luarocks"
84 chmod +rx "$(DESTDIR)$(PREFIX)/bin/luarocks" 84 chmod +rx "$(DESTDIR)$(prefix)/bin/luarocks"
85 cp build-binary/luarocks-admin.exe "$(DESTDIR)$(PREFIX)/bin/luarocks-admin" 85 cp build-binary/luarocks-admin.exe "$(DESTDIR)$(prefix)/bin/luarocks-admin"
86 chmod +rx "$(DESTDIR)$(PREFIX)/bin/luarocks-admin" 86 chmod +rx "$(DESTDIR)$(prefix)/bin/luarocks-admin"
87 mkdir -p "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/core" 87 mkdir -p "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks/core"
88 cp -a src/luarocks/core/* "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/core" 88 cp -a src/luarocks/core/* "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks/core"
89 cp -a src/luarocks/loader.lua "$(DESTDIR)$(PREFIX)/share/lua/$(LUA_VERSION)/luarocks/" 89 cp -a src/luarocks/loader.lua "$(DESTDIR)$(prefix)/share/lua/$(LUA_VERSION)/luarocks/"
90 90
91# ---------------------------------------- 91# ----------------------------------------
92# Bootstrap install 92# Bootstrap install
93# ---------------------------------------- 93# ----------------------------------------
94 94
95bootstrap: luarocks $(DESTDIR)$(SYSCONFDIR)/config-$(LUA_VERSION).lua 95bootstrap: luarocks $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua
96 ./luarocks make --tree="$(DESTDIR)$(ROCKS_TREE)" 96 ./luarocks make --tree="$(DESTDIR)$(ROCKS_TREE)"
97 97
98# ---------------------------------------- 98# ----------------------------------------
diff --git a/configure b/configure
index d92a3915..8b6d0d24 100755
--- a/configure
+++ b/configure
@@ -2,9 +2,10 @@
2 2
3# Defaults 3# Defaults
4 4
5PREFIX="/usr/local" 5prefix="/usr/local"
6SYSCONFDIR="$PREFIX/etc/luarocks" 6sysconfdir="$prefix/etc"
7ROCKS_TREE="$PREFIX" 7luarocksconfdir="$sysconfdir/luarocks"
8ROCKS_TREE="$prefix"
8 9
9# ---------------------------------------------------------------------------- 10# ----------------------------------------------------------------------------
10# FUNCTION DEFINITIONS 11# FUNCTION DEFINITIONS
@@ -94,10 +95,13 @@ Where to install LuaRocks:
94-------------------------- 95--------------------------
95 96
96--prefix=PREFIX Directory where LuaRocks should be installed. 97--prefix=PREFIX Directory where LuaRocks should be installed.
97 - Default is $PREFIX 98 - Default is $prefix
98--sysconfdir=SYSCONFDIR Where the config file should be installed. 99--sysconfdir=SYSCONFDIR Where system config files should be installed.
99 - Default is $SYSCONFDIR 100 - Default is $sysconfdir
100 (PREFIX/etc/luarocks) 101 (PREFIX/etc)
102--luarocksconfdir=DIR Where the luarocks config file should be installed.
103 - Default is $luarocksconfdir
104 (SYSCONFDIR/luarocks)
101 105
102Where to install files provided by rocks: 106Where to install files provided by rocks:
103----------------------------------------- 107-----------------------------------------
@@ -108,7 +112,7 @@ Where to install files provided by rocks:
108 "luarocks path --help" after installation. 112 "luarocks path --help" after installation.
109 Avoid using paths controlled by your 113 Avoid using paths controlled by your
110 system's package manager, such as /usr. 114 system's package manager, such as /usr.
111 - Default is $PREFIX 115 - Default is $prefix
112 (PREFIX) 116 (PREFIX)
113 117
114Where is your Lua interpreter: 118Where is your Lua interpreter:
@@ -234,13 +238,18 @@ do
234 # -------------------------- 238 # --------------------------
235 --prefix) 239 --prefix)
236 [ -n "$value" ] || die "Missing value in flag $key." 240 [ -n "$value" ] || die "Missing value in flag $key."
237 PREFIX="$(canonicalpath "$value")" 241 prefix="$(canonicalpath "$value")"
238 PREFIX_SET=yes 242 prefix_SET=yes
239 ;; 243 ;;
240 --sysconfdir) 244 --sysconfdir)
241 [ -n "$value" ] || die "Missing value in flag $key." 245 [ -n "$value" ] || die "Missing value in flag $key."
242 SYSCONFDIR="$(canonicalpath "$value")" 246 sysconfdir="$(canonicalpath "$value")"
243 SYSCONFDIR_SET=yes 247 sysconfdir_SET=yes
248 ;;
249 --luarocksconfdir)
250 [ -n "$value" ] || die "Missing value in flag $key."
251 luarocksconfdir="$(canonicalpath "$value")"
252 luarocksconfdir_SET=yes
244 ;; 253 ;;
245 254
246 255
@@ -329,17 +338,23 @@ echo
329# Derive options from the ones given 338# Derive options from the ones given
330# ---------------------------------------- 339# ----------------------------------------
331 340
332if [ "$PREFIX_SET" = "yes" ] && [ ! "$SYSCONFDIR_SET" = "yes" ] 341if [ "$prefix_SET" = "yes" ] && [ ! "$sysconfdir_SET" = "yes" ]
333then 342then
334 if [ "$PREFIX" = "/usr" ] 343 if [ "$prefix" = "/usr" ]
335 then SYSCONFDIR=/etc/luarocks 344 then sysconfdir=/etc
336 else SYSCONFDIR=$PREFIX/etc/luarocks 345 else sysconfdir=$prefix/etc
337 fi 346 fi
347 sysconfdir_SET=yes
348fi
349
350if [ "$sysconfdir_SET" = "yes" ] && [ ! "$luarocksconfdir_SET" = "yes" ]
351then
352 luarocksconfdir=$sysconfdir/luarocks
338fi 353fi
339 354
340if [ "$PREFIX_SET" = "yes" ] && [ ! "$ROCKS_TREE_SET" = "yes" ] 355if [ "$prefix_SET" = "yes" ] && [ ! "$ROCKS_TREE_SET" = "yes" ]
341then 356then
342 ROCKS_TREE=$PREFIX 357 ROCKS_TREE=$prefix
343fi 358fi
344 359
345# ---------------------------------------- 360# ----------------------------------------
@@ -477,8 +492,8 @@ cat <<EOF > config.unix
477# This file was automatically generated by the configure script. 492# This file was automatically generated by the configure script.
478# Run "./configure --help" for details. 493# Run "./configure --help" for details.
479 494
480PREFIX=$PREFIX 495prefix=$prefix
481SYSCONFDIR=$SYSCONFDIR 496luarocksconfdir=$luarocksconfdir
482ROCKS_TREE=$ROCKS_TREE 497ROCKS_TREE=$ROCKS_TREE
483LUA_VERSION=$LUA_VERSION 498LUA_VERSION=$LUA_VERSION
484LUA_INTERPRETER=$LUA_INTERPRETER 499LUA_INTERPRETER=$LUA_INTERPRETER
@@ -509,16 +524,16 @@ echo
509BLUE "Done configuring." 524BLUE "Done configuring."
510echo 525echo
511echo 526echo
512echo "LuaRocks will be installed at......: $(GREEN "$PREFIX")" 527echo "LuaRocks will be installed at......: $(GREEN "$prefix")"
513echo "LuaRocks will install rocks at.....: $(GREEN "$ROCKS_TREE")" 528echo "LuaRocks will install rocks at.....: $(GREEN "$ROCKS_TREE")"
514echo "LuaRocks configuration directory...: $(GREEN "$SYSCONFDIR")" 529echo "LuaRocks configuration directory...: $(GREEN "$luarocksconfdir")"
515echo "Using Lua from.....................: $(GREEN "$LUA_DIR")" 530echo "Using Lua from.....................: $(GREEN "$LUA_DIR")"
516if [ "$LUA_BINDIR_SET" = "yes" ]; then echo "Lua bin directory..................: $(GREEN "$LUA_BINDIR")" ; fi 531if [ "$LUA_BINDIR_SET" = "yes" ]; then echo "Lua bin directory..................: $(GREEN "$LUA_BINDIR")" ; fi
517if [ "$LUA_INCDIR_SET" = "yes" ]; then echo "Lua include directory..............: $(GREEN "$LUA_INCDIR")" ; fi 532if [ "$LUA_INCDIR_SET" = "yes" ]; then echo "Lua include directory..............: $(GREEN "$LUA_INCDIR")" ; fi
518if [ "$LUA_LIBDIR_SET" = "yes" ]; then echo "Lua lib directory..................: $(GREEN "$LUA_LIBDIR")" ; fi 533if [ "$LUA_LIBDIR_SET" = "yes" ]; then echo "Lua lib directory..................: $(GREEN "$LUA_LIBDIR")" ; fi
519echo 534echo
520echo "* Type $(BOLD make) and $(BOLD make install):" 535echo "* Type $(BOLD make) and $(BOLD make install):"
521echo " to install to $PREFIX as usual." 536echo " to install to $prefix as usual."
522echo "* Type $(BOLD make bootstrap):" 537echo "* Type $(BOLD make bootstrap):"
523echo " to install LuaRocks into $ROCKS_TREE as a rock." 538echo " to install LuaRocks into $ROCKS_TREE as a rock."
524echo 539echo
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-28 07:23:19 +0000