summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2011-09-16 15:16:18 -0300
committerHisham Muhammad <hisham@gobolinux.org>2011-09-16 15:16:18 -0300
commit4f983c3fc840e6d3bf4b4980bdfd04e9dcd265e0 (patch)
tree6edde98b00a353217611540f3f7262aa5ad0a9f6 /Makefile
parent1eb33f04bea27b8da82903519e63fde50efa288a (diff)
downloadluarocks-4f983c3fc840e6d3bf4b4980bdfd04e9dcd265e0.tar.gz
luarocks-4f983c3fc840e6d3bf4b4980bdfd04e9dcd265e0.tar.bz2
luarocks-4f983c3fc840e6d3bf4b4980bdfd04e9dcd265e0.zip
Rename luarocks.config to luarocks.site_config, to avoid confusion with the system-wide configuration file. Thanks to Ignacio for the investigation. Closes #41.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile42
1 files changed, 21 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index fb16b3fc..182077c7 100644
--- a/Makefile
+++ b/Makefile
@@ -26,45 +26,45 @@ CONFIG_FILE = $(SYSCONFDIR)/config.lua
26 26
27all: built 27all: built
28 28
29src/luarocks/config.lua: config.unix 29src/luarocks/site_config.lua: config.unix
30 rm -f src/luarocks/config.lua 30 rm -f src/luarocks/site_config.lua
31 echo 'module("luarocks.config")' >> src/luarocks/config.lua 31 echo 'module("luarocks.site_config")' >> src/luarocks/site_config.lua
32 if [ -n "$(PREFIX)" ] ;\ 32 if [ -n "$(PREFIX)" ] ;\
33 then \ 33 then \
34 echo "LUAROCKS_PREFIX=[[$(PREFIX)]]" >> src/luarocks/config.lua ;\ 34 echo "LUAROCKS_PREFIX=[[$(PREFIX)]]" >> src/luarocks/site_config.lua ;\
35 fi 35 fi
36 if [ -n "$(LUA_INCDIR)" ] ;\ 36 if [ -n "$(LUA_INCDIR)" ] ;\
37 then \ 37 then \
38 echo "LUA_INCDIR=[[$(LUA_INCDIR)]]" >> src/luarocks/config.lua ;\ 38 echo "LUA_INCDIR=[[$(LUA_INCDIR)]]" >> src/luarocks/site_config.lua ;\
39 fi 39 fi
40 if [ -n "$(LUA_LIBDIR)" ] ;\ 40 if [ -n "$(LUA_LIBDIR)" ] ;\
41 then \ 41 then \
42 echo "LUA_LIBDIR=[[$(LUA_LIBDIR)]]" >> src/luarocks/config.lua ;\ 42 echo "LUA_LIBDIR=[[$(LUA_LIBDIR)]]" >> src/luarocks/site_config.lua ;\
43 fi 43 fi
44 if [ -n "$(LUA_BINDIR)" ] ;\ 44 if [ -n "$(LUA_BINDIR)" ] ;\
45 then \ 45 then \
46 echo "LUA_BINDIR=[[$(LUA_BINDIR)]]" >> src/luarocks/config.lua ;\ 46 echo "LUA_BINDIR=[[$(LUA_BINDIR)]]" >> src/luarocks/site_config.lua ;\
47 fi 47 fi
48 if [ -n "$(LUA_SUFFIX)" ] ;\ 48 if [ -n "$(LUA_SUFFIX)" ] ;\
49 then \ 49 then \
50 echo "LUA_INTERPRETER=[[lua$(LUA_SUFFIX)]]" >> src/luarocks/config.lua ;\ 50 echo "LUA_INTERPRETER=[[lua$(LUA_SUFFIX)]]" >> src/luarocks/site_config.lua ;\
51 fi 51 fi
52 if [ -n "$(SYSCONFDIR)" ] ;\ 52 if [ -n "$(SYSCONFDIR)" ] ;\
53 then \ 53 then \
54 echo "LUAROCKS_SYSCONFIG=[[$(SYSCONFDIR)/config.lua]]" >> src/luarocks/config.lua ;\ 54 echo "LUAROCKS_SYSCONFIG=[[$(SYSCONFDIR)/config.lua]]" >> src/luarocks/site_config.lua ;\
55 fi 55 fi
56 if [ -n "$(ROCKS_TREE)" ] ;\ 56 if [ -n "$(ROCKS_TREE)" ] ;\
57 then \ 57 then \
58 echo "LUAROCKS_ROCKS_TREE=[[$(ROCKS_TREE)]]" >> src/luarocks/config.lua ;\ 58 echo "LUAROCKS_ROCKS_TREE=[[$(ROCKS_TREE)]]" >> src/luarocks/site_config.lua ;\
59 fi 59 fi
60 if [ -n "$(FORCE_CONFIG)" ] ;\ 60 if [ -n "$(FORCE_CONFIG)" ] ;\
61 then \ 61 then \
62 echo "LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/config.lua ;\ 62 echo "LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/site_config.lua ;\
63 fi 63 fi
64 echo "LUAROCKS_UNAME_S=[[$(LUAROCKS_UNAME_S)]]" >> src/luarocks/config.lua 64 echo "LUAROCKS_UNAME_S=[[$(LUAROCKS_UNAME_S)]]" >> src/luarocks/site_config.lua
65 echo "LUAROCKS_UNAME_M=[[$(LUAROCKS_UNAME_M)]]" >> src/luarocks/config.lua 65 echo "LUAROCKS_UNAME_M=[[$(LUAROCKS_UNAME_M)]]" >> src/luarocks/site_config.lua
66 echo "LUAROCKS_DOWNLOADER=[[$(LUAROCKS_DOWNLOADER)]]" >> src/luarocks/config.lua 66 echo "LUAROCKS_DOWNLOADER=[[$(LUAROCKS_DOWNLOADER)]]" >> src/luarocks/site_config.lua
67 echo "LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/config.lua 67 echo "LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/site_config.lua
68 68
69build_bins: 69build_bins:
70 for f in $(BIN_FILES) ;\ 70 for f in $(BIN_FILES) ;\
@@ -76,7 +76,7 @@ build_bins:
76 rm src/bin/$$f.bak ;\ 76 rm src/bin/$$f.bak ;\
77 done 77 done
78 78
79built: cleanup_bins src/luarocks/config.lua build_bins 79built: cleanup_bins src/luarocks/site_config.lua build_bins
80 touch built 80 touch built
81 @echo 81 @echo
82 @echo "Done. Type 'make install' to install into $(PREFIX)." 82 @echo "Done. Type 'make install' to install into $(PREFIX)."
@@ -106,7 +106,7 @@ cleanup_bins:
106 done 106 done
107 107
108clean: cleanup_bins 108clean: cleanup_bins
109 rm -f src/luarocks/config.lua 109 rm -f src/luarocks/site_config.lua
110 rm -f built 110 rm -f built
111 111
112install_bins: 112install_bins:
@@ -117,9 +117,9 @@ install_luas:
117 mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" 117 mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"
118 cd src/luarocks && for f in $(LUAROCKS_FILES); do d="$(DESTDIR)$(LUADIR)/luarocks"/`dirname "$$f"`; mkdir -p "$$d"; cp "$$f" "$$d"; done 118 cd src/luarocks && for f in $(LUAROCKS_FILES); do d="$(DESTDIR)$(LUADIR)/luarocks"/`dirname "$$f"`; mkdir -p "$$d"; cp "$$f" "$$d"; done
119 119
120install_config: 120install_site_config:
121 mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" 121 mkdir -p "$(DESTDIR)$(LUADIR)/luarocks"
122 cd src/luarocks && cp config.lua "$(DESTDIR)$(LUADIR)/luarocks" 122 cd src/luarocks && cp site_config.lua "$(DESTDIR)$(LUADIR)/luarocks"
123 123
124write_sysconfig: 124write_sysconfig:
125 mkdir -p "$(DESTDIR)$(ROCKS_TREE)" 125 mkdir -p "$(DESTDIR)$(ROCKS_TREE)"
@@ -138,9 +138,9 @@ write_sysconfig:
138 echo '}' >> "$(DESTDIR)$(CONFIG_FILE)" ;\ 138 echo '}' >> "$(DESTDIR)$(CONFIG_FILE)" ;\
139 fi 139 fi
140 140
141install: built install_bins install_luas install_config write_sysconfig 141install: built install_bins install_luas install_site_config write_sysconfig
142 142
143bootstrap: src/luarocks/config.lua install_config write_sysconfig 143bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig
144 LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" src/bin/luarocks make rockspec 144 LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" src/bin/luarocks make rockspec
145 145
146install_rock: install_bins install_luas 146install_rock: install_bins install_luas