aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rwxr-xr-xconfigure1
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b44ab1ca..0c3ed51e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,9 @@ help.lua util.lua index.lua cache.lua add.lua refresh_cache.lua loader.lua
22 22
23CONFIG_FILE = $(SYSCONFDIR)/config.lua 23CONFIG_FILE = $(SYSCONFDIR)/config.lua
24 24
25all: 25all: built
26
27built:
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
105install: 108install: 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"
diff --git a/configure b/configure
index b7bd5197..25ea14c8 100755
--- a/configure
+++ b/configure
@@ -346,6 +346,7 @@ fi
346echo "Writing configuration..." 346echo "Writing configuration..."
347echo 347echo
348 348
349rm -f built
349cat <<EOF > config.unix 350cat <<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.