diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-08-30 16:07:02 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-08-30 16:07:02 +0100 |
| commit | 56048c5a7f47f915ed7506779fd8f75bb90bee78 (patch) | |
| tree | e3ff3bad35d1337d18b500b4c1be025a4809c402 /Makefile | |
| parent | a797a8a9d11b0f0ca9bc738192475b06d5aacc9a (diff) | |
| download | gitano-56048c5a7f47f915ed7506779fd8f75bb90bee78.tar.gz | |
BUILD: More work towards an installer
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 17 insertions, 7 deletions
@@ -11,9 +11,15 @@ LUA_MOD_PATH := $(INST_ROOT)/share/lua/$(LUA_VER) LUA_MOD_INST_PATH := $(DESTDIR)$(LUA_MOD_PATH) BIN_PATH := $(INST_ROOT)/bin BIN_INST_PATH := $(DESTDIR)$(BIN_PATH) +LIB_BIN_PATH := $(INST_ROOT)/lib/gitano/bin +LIB_BIN_INST_PATH := $(DESTDIR)$(LIB_BIN_PATH) +SHARE_PATH := $(INST_ROOT)/share/gitano +SHARE_INST_PATH := $(DESTDIR)$(SHARE_PATH) -BINS := gitano-auth gitano-post-receive-hook gitano-update-hook \ - gitano-update-ssh +LIB_BINS := gitano-auth gitano-post-receive-hook gitano-update-hook \ + gitano-update-ssh + +BINS := gitano-setup MODS := gitano \ \ @@ -29,21 +35,21 @@ MOD_DIRS := gitano gitano/git MOD_FILES := $(patsubst %,%.lua,$(subst .,/,$(MODS))) SRC_MOD_FILES := $(patsubst %,lib/%,$(MOD_FILES)) -LOCAL_BINS := $(patsubst %,bin/%,$(BINS)) -BIN_SRCS := $(patsubst %,bin/%.in,$(BINS)) +LOCAL_BINS := $(patsubst %,bin/%,$(BINS) $(LIB_BINS)) +LIB_BIN_SRCS := $(patsubst %,bin/%.in,$(LIB_BINS)) GEN_BIN := utils/install-lua-bin RUN_GEN_BIN := $(LUA) $(GEN_BIN) $(LUA) define GEN_LOCAL_BIN -$(RUN_GEN_BIN) $(shell pwd)/lib $1 $2 +$(RUN_GEN_BIN) $(shell pwd) $(shell pwd)/bin $(shell pwd)/lib $1 $2 chmod 755 $2 endef define GEN_INSTALL_BIN -$(RUN_GEN_BIN) $(LUA_MOD_PATH) $1 $2 +$(RUN_GEN_BIN) $(SHARE_PATH) $(LIB_BIN_PATH) $(LUA_MOD_PATH) $1 $2 chmod 755 $2 endef @@ -63,12 +69,16 @@ clean: bin/%: bin/%.in $(GEN_BIN) $(call GEN_LOCAL_BIN,$<,$@) -install: install-bins install-mods +install: install-bins install-lib-bins install-mods install-bins: $(BIN_SRCS) $(GEN_BIN) mkdir -p $(BIN_INST_PATH) $(foreach BIN,$(BINS),$(call GEN_INSTALL_BIN,bin/$(BIN).in,$(BIN_INST_PATH)/$(BIN))) +install-lib-bins: $(LIB_BIN_SRCS) $(GEN_BIN) + mkdir -p $(LIB_BIN_INST_PATH) + $(foreach BIN,$(LIB_BINS),$(call GEN_INSTALL_BIN,bin/$(BIN).in,$(LIB_BIN_INST_PATH)/$(BIN))) + install-mods: $(SRC_MOD_FILES) mkdir -p $(patsubst %,$(LUA_MOD_INST_PATH)/%,$(MOD_DIRS)) $(foreach MOD,$(MOD_FILES),$(call GEN_INSTALL_MOD,lib/$(MOD),$(LUA_MOD_INST_PATH)/$(MOD))) |