From 26693a8a60fcc7ed98632f6528710ca53cd27557 Mon Sep 17 00:00:00 2001 From: hisham Date: Tue, 13 Oct 2009 05:51:37 +0000 Subject: allow running make install directly git-svn-id: http://luarocks.org/svn/luarocks/trunk@94 9ca3f7c1-7366-0410-b1a3-b5c78f85698c --- Makefile | 7 +++++-- configure | 1 + 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 CONFIG_FILE = $(SYSCONFDIR)/config.lua -all: +all: built + +built: for f in $(BIN_FILES) ;\ do \ sed "1d" src/bin/$$f >> src/bin/$$f.bak ;\ @@ -73,6 +75,7 @@ all: echo "local LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/cfg.lua cat src/luarocks/cfg.lua.bak >> src/luarocks/cfg.lua rm src/luarocks/cfg.lua.bak + touch built @echo @echo "Done. Type 'make install' to install into $(PREFIX)." @echo @@ -102,7 +105,7 @@ clean: sed -i.bak "/^local LUA/d" src/luarocks/cfg.lua rm src/luarocks/cfg.lua.bak -install: +install: built mkdir -p "$(DESTDIR)$(BINDIR)" cd src/bin && cp $(BIN_FILES) "$(DESTDIR)$(BINDIR)" mkdir -p "$(DESTDIR)$(LUADIR)/luarocks" diff --git a/configure b/configure index b7bd5197..25ea14c8 100755 --- a/configure +++ b/configure @@ -346,6 +346,7 @@ fi echo "Writing configuration..." echo +rm -f built cat < config.unix # This file was automatically generated by the configure script. # Run "./configure --help" for details. -- cgit v1.2.3-55-g6feb