From a3c6ff07cad67ec5e9d0899002710cdd73d6915f Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 29 Jul 2012 18:32:23 +0100 Subject: Makefile: Installation support better --- Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7e2ad42..2228776 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,11 @@ LUA_VER := 5.1 TEST_MODULES := $(MODULES) INST_BASE := /usr/local +WRAPPER_PATH := $(INST_BASE)/bin/supple-sandbox$(LUA_VER) + LINST_ROOT := $(DESTDIR)$(INST_BASE)/share/lua/$(LUA_VER) CINST_ROOT := $(DESTDIR)$(INST_BASE)/lib/lua/$(LUA_VER) - +BINST_ROOT := $(DESTDIR)$(INST_BASE)/bin LMOD_FILES := $(patsubst %,%.lua,$(subst .,/,$(LMODULES))) CMOD_FILES := $(patsubst %,%.so,$(subst .,/,$(CMODULES))) @@ -44,15 +46,20 @@ wrapper: src/wrapper.c testwrapper: src/wrapper.c $(CC) $(LFLAGS) $(CFLAGS) -DTESTING_SUPPLE -o $@ $< -llua$(LUA_VER) - -chown root:root $@ - -chmod u+s $@ + -chown root:root $@ && chmod u+s $@ ls -l $@ +COPY_LMOD := sed -e's!@@WRAPPER_BIN@@!$(WRAPPER_PATH)!g;/START_TEST_SUPPLE/,/END_TEST_SUPPLE/d' + install: build mkdir -p $(LINST_ROOT)/supple mkdir -p $(CINST_ROOT)/supple + mkdir -p $(BINST_ROOT) + cp wrapper $(DESTDIR)$(WRAPPER_PATH) + chown root:root $(DESTDIR)$(WRAPPER_PATH) + chmod u+s $(DESTDIR)$(WRAPPER_PATH) for MOD in $(sort $(LMOD_FILES)); do \ - cp lib/$${MOD} $(LINST_ROOT)/$${MOD}; \ + $(COPY_LMOD) lib/$${MOD} > $(LINST_ROOT)/$${MOD}; \ done for MOD in $(sort $(CMOD_FILES)); do \ cp lib/$${MOD} $(CINST_ROOT)/$${MOD}; \ -- cgit v1.2.1