diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2013-04-12 23:05:43 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2013-04-12 23:05:43 -0300 |
| commit | 130f460fca140b2873d284d0057b326b64621d1d (patch) | |
| tree | 825a90c51e9fd9b15f98d1c7e9a38eca439862c5 /Makefile | |
| parent | 26db61478504c7b13099b942aeebbdd6ffa4472b (diff) | |
| download | luarocks-130f460fca140b2873d284d0057b326b64621d1d.tar.gz luarocks-130f460fca140b2873d284d0057b326b64621d1d.tar.bz2 luarocks-130f460fca140b2873d284d0057b326b64621d1d.zip | |
General improvements for Lua 5.1 and 5.2 coexistance:
* Add --versioned-rocks-dir option to Unix installer, which makes it use paths such as /lib/luarocks/rocks-5.X, and /etc/luarocks/config-5.X.lua (where X is 1 or 2).
* Make configure script on Unix autodetect the presence of previous LuaRocks installations and adapt accordingly to avoid conflicts.
* Support luarocks.site_config_5_X for users who wish to run two versions from the same source tree (may be useful for LR development).
* Try to load config-5.X.lua from home directory before trying config.lua.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 11 insertions, 3 deletions
| @@ -22,7 +22,7 @@ manif_core.lua fetch.lua unpack.lua validate.lua cfg.lua download.lua \ | |||
| 22 | help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua \ | 22 | help.lua util.lua index.lua cache.lua refresh_cache.lua loader.lua \ |
| 23 | admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua purge.lua | 23 | admin_remove.lua fetch/hg.lua fetch/git_file.lua new_version.lua lint.lua purge.lua |
| 24 | 24 | ||
| 25 | CONFIG_FILE = $(SYSCONFDIR)/config.lua | 25 | CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua |
| 26 | 26 | ||
| 27 | all: built | 27 | all: built |
| 28 | 28 | ||
| @@ -51,7 +51,7 @@ src/luarocks/site_config.lua: config.unix | |||
| 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/site_config.lua ;\ | 54 | echo "LUAROCKS_SYSCONFDIR=[[$(SYSCONFDIR)]]" >> src/luarocks/site_config.lua ;\ |
| 55 | fi | 55 | fi |
| 56 | if [ -n "$(ROCKS_TREE)" ] ;\ | 56 | if [ -n "$(ROCKS_TREE)" ] ;\ |
| 57 | then \ | 57 | then \ |
| @@ -61,6 +61,10 @@ src/luarocks/site_config.lua: config.unix | |||
| 61 | then \ | 61 | then \ |
| 62 | echo "LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/site_config.lua ;\ | 62 | echo "LUAROCKS_FORCE_CONFIG=true" >> src/luarocks/site_config.lua ;\ |
| 63 | fi | 63 | fi |
| 64 | if [ -n "$(LUAROCKS_ROCKS_SUBDIR)" ] ;\ | ||
| 65 | then \ | ||
| 66 | echo "LUAROCKS_ROCKS_SUBDIR=[[$(LUAROCKS_ROCKS_SUBDIR)]]" >> src/luarocks/site_config.lua ;\ | ||
| 67 | fi | ||
| 64 | if [ "$(LUA_DIR_SET)" = "yes" ] ;\ | 68 | if [ "$(LUA_DIR_SET)" = "yes" ] ;\ |
| 65 | then \ | 69 | then \ |
| 66 | echo "LUA_DIR_SET=true" >> src/luarocks/site_config.lua ;\ | 70 | echo "LUA_DIR_SET=true" >> src/luarocks/site_config.lua ;\ |
| @@ -121,7 +125,11 @@ clean: cleanup_bins | |||
| 121 | 125 | ||
| 122 | install_bins: built | 126 | install_bins: built |
| 123 | mkdir -p "$(DESTDIR)$(BINDIR)" | 127 | mkdir -p "$(DESTDIR)$(BINDIR)" |
| 124 | cd src/bin && cp $(BIN_FILES) "$(DESTDIR)$(BINDIR)" | 128 | cd src/bin && for f in $(BIN_FILES); \ |
| 129 | do \ | ||
| 130 | cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)"; \ | ||
| 131 | ln -nfs "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)" "$(DESTDIR)$(BINDIR)/$$f"; \ | ||
| 132 | done | ||
| 125 | 133 | ||
| 126 | install_luas: built | 134 | install_luas: built |
| 127 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" | 135 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" |