diff options
| author | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-11 06:24:21 +0000 |
|---|---|---|
| committer | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-11 06:24:21 +0000 |
| commit | 6fcee351a9405fa8f7f8a55bb119a5943015c749 (patch) | |
| tree | c13fd08f1ccdb71f8a18b2897a25822772b11acd | |
| parent | 3e46fbfefd841015a1673e91cf81bf76236c1cf8 (diff) | |
| download | luarocks-6fcee351a9405fa8f7f8a55bb119a5943015c749.tar.gz luarocks-6fcee351a9405fa8f7f8a55bb119a5943015c749.tar.bz2 luarocks-6fcee351a9405fa8f7f8a55bb119a5943015c749.zip | |
better defaults for LuaRocks 2.0
git-svn-id: http://luarocks.org/svn/luarocks/trunk@89 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rwxr-xr-x | makedist | 6 |
3 files changed, 7 insertions, 5 deletions
| @@ -31,6 +31,8 @@ all: | |||
| 31 | cat src/bin/$$f.bak >> src/bin/$$f ;\ | 31 | cat src/bin/$$f.bak >> src/bin/$$f ;\ |
| 32 | rm src/bin/$$f.bak ;\ | 32 | rm src/bin/$$f.bak ;\ |
| 33 | done | 33 | done |
| 34 | sed -i.bak "/^local LUA/d" src/luarocks/cfg.lua | ||
| 35 | rm src/luarocks/cfg.lua.bak | ||
| 34 | cp src/luarocks/cfg.lua src/luarocks/cfg.lua.bak | 36 | cp src/luarocks/cfg.lua src/luarocks/cfg.lua.bak |
| 35 | rm src/luarocks/cfg.lua | 37 | rm src/luarocks/cfg.lua |
| 36 | if [ -n "$(PREFIX)" ] ;\ | 38 | if [ -n "$(PREFIX)" ] ;\ |
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | PREFIX="/usr/local" | 8 | PREFIX="/usr/local" |
| 9 | SYSCONFDIR="$PREFIX/etc/luarocks" | 9 | SYSCONFDIR="$PREFIX/etc/luarocks" |
| 10 | ROCKS_TREE="$PREFIX/lib/luarocks" | 10 | ROCKS_TREE="$PREFIX" |
| 11 | SCRIPTS_DIR="" | 11 | SCRIPTS_DIR="" |
| 12 | LUA_MODULES_DIR="" | 12 | LUA_MODULES_DIR="" |
| 13 | BIN_MODULES_DIR="" | 13 | BIN_MODULES_DIR="" |
| @@ -33,7 +33,7 @@ Configure LuaRocks. | |||
| 33 | --sysconfdir=DIR Location where the config file should be installed. | 33 | --sysconfdir=DIR Location where the config file should be installed. |
| 34 | Default is \$PREFIX/etc/luarocks | 34 | Default is \$PREFIX/etc/luarocks |
| 35 | --rocks-tree=FILE Root of the local tree of installed rocks. | 35 | --rocks-tree=FILE Root of the local tree of installed rocks. |
| 36 | Default is \$PREFIX/lib/luarocks | 36 | Default is \$PREFIX |
| 37 | 37 | ||
| 38 | Where to install files installed by rocks, to make the accessible to Lua and | 38 | Where to install files installed by rocks, to make the accessible to Lua and |
| 39 | your \$PATH. Beware of clashes between files installed by LuaRocks and by your | 39 | your \$PATH. Beware of clashes between files installed by LuaRocks and by your |
| @@ -4,7 +4,7 @@ cvslist() { | |||
| 4 | if [ "$1" ] | 4 | if [ "$1" ] |
| 5 | then local prefix="$1/" | 5 | then local prefix="$1/" |
| 6 | fi | 6 | fi |
| 7 | cvs list $1 | grep -v "^?" | while read line | 7 | svn list $1 | grep -v "^?" | while read line |
| 8 | do | 8 | do |
| 9 | local path="$prefix$line" | 9 | local path="$prefix$line" |
| 10 | echo "$path" | 10 | echo "$path" |
| @@ -21,10 +21,10 @@ then | |||
| 21 | exit 1 | 21 | exit 1 |
| 22 | fi | 22 | fi |
| 23 | 23 | ||
| 24 | cvs list > /dev/null 2> /dev/null | 24 | svn list > /dev/null 2> /dev/null |
| 25 | if [ $? != 0 ] | 25 | if [ $? != 0 ] |
| 26 | then | 26 | then |
| 27 | echo "Your version of CVS may be too old. At least 1.12 is needed." | 27 | echo "Your version of svn may be too old." |
| 28 | exit 1 | 28 | exit 1 |
| 29 | fi | 29 | fi |
| 30 | 30 | ||