diff options
author | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-13 05:51:37 +0000 |
---|---|---|
committer | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-13 05:51:37 +0000 |
commit | 26693a8a60fcc7ed98632f6528710ca53cd27557 (patch) | |
tree | 3a65bc12d52b7331d22353e7d2f28f151db833d6 | |
parent | 673fe23f430398f0485c793626ab86f830238f7d (diff) | |
download | luarocks-26693a8a60fcc7ed98632f6528710ca53cd27557.tar.gz luarocks-26693a8a60fcc7ed98632f6528710ca53cd27557.tar.bz2 luarocks-26693a8a60fcc7ed98632f6528710ca53cd27557.zip |
allow running make install directly
git-svn-id: http://luarocks.org/svn/luarocks/trunk@94 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
-rw-r--r-- | Makefile | 7 | ||||
-rwxr-xr-x | configure | 1 |
2 files changed, 6 insertions, 2 deletions
@@ -22,7 +22,9 @@ help.lua util.lua index.lua cache.lua add.lua refresh_cache.lua loader.lua | |||
22 | 22 | ||
23 | CONFIG_FILE = $(SYSCONFDIR)/config.lua | 23 | CONFIG_FILE = $(SYSCONFDIR)/config.lua |
24 | 24 | ||
25 | all: | 25 | all: built |
26 | |||
27 | built: | ||
26 | for f in $(BIN_FILES) ;\ | 28 | for f in $(BIN_FILES) ;\ |
27 | do \ | 29 | do \ |
28 | sed "1d" src/bin/$$f >> src/bin/$$f.bak ;\ | 30 | sed "1d" src/bin/$$f >> src/bin/$$f.bak ;\ |
@@ -73,6 +75,7 @@ all: | |||
73 | echo "local LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/cfg.lua | 75 | echo "local LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/cfg.lua |
74 | cat src/luarocks/cfg.lua.bak >> src/luarocks/cfg.lua | 76 | cat src/luarocks/cfg.lua.bak >> src/luarocks/cfg.lua |
75 | rm src/luarocks/cfg.lua.bak | 77 | rm src/luarocks/cfg.lua.bak |
78 | touch built | ||
76 | @echo | 79 | @echo |
77 | @echo "Done. Type 'make install' to install into $(PREFIX)." | 80 | @echo "Done. Type 'make install' to install into $(PREFIX)." |
78 | @echo | 81 | @echo |
@@ -102,7 +105,7 @@ clean: | |||
102 | sed -i.bak "/^local LUA/d" src/luarocks/cfg.lua | 105 | sed -i.bak "/^local LUA/d" src/luarocks/cfg.lua |
103 | rm src/luarocks/cfg.lua.bak | 106 | rm src/luarocks/cfg.lua.bak |
104 | 107 | ||
105 | install: | 108 | install: built |
106 | mkdir -p "$(DESTDIR)$(BINDIR)" | 109 | mkdir -p "$(DESTDIR)$(BINDIR)" |
107 | cd src/bin && cp $(BIN_FILES) "$(DESTDIR)$(BINDIR)" | 110 | cd src/bin && cp $(BIN_FILES) "$(DESTDIR)$(BINDIR)" |
108 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" | 111 | mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" |
@@ -346,6 +346,7 @@ fi | |||
346 | echo "Writing configuration..." | 346 | echo "Writing configuration..." |
347 | echo | 347 | echo |
348 | 348 | ||
349 | rm -f built | ||
349 | cat <<EOF > config.unix | 350 | cat <<EOF > config.unix |
350 | # This file was automatically generated by the configure script. | 351 | # This file was automatically generated by the configure script. |
351 | # Run "./configure --help" for details. | 352 | # Run "./configure --help" for details. |