From e3e4b935488a152f1aaa9c28d27f880f29d7088e Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 22 Aug 2007 14:42:32 +0000 Subject: [PATCH] defs.mk: Add standard install framework for SCRIPT and INIT --- make/defs.mk | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index da750edd..11b003bb 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -165,13 +165,14 @@ UPLOAD_URL_RPM_SRC = rsync_ssh://ftp.jannet.de:/home/ftp/dat/pub/packages/rp # -- standard dirs and files for build and install -INSTALLATION_FILE_TYPES= LIB HDR EXE DOC PROFILE MAKE +INSTALLATION_FILE_TYPES= LIB HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG # -- CFG -BUILD_CFGDIR = $(TOPDIR)/conf CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf SYSCONFIG_FILE ?= $(SYSCONFIG_DIR)/$(PROJECT) +BUILD_CFGDIR = $(TOPDIR)/conf INSTALL_CFGDIR = $(CFG_PREFIX)/etc +INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR),$(wildcard *.conf)) # -- HDR # why both SRC_H <-> LOCAL_H? @@ -188,7 +189,7 @@ INSTALLED_HDR += $(addprefix $(INSTALL_HDRDIR)/,$(SRC_H)) # -- DOC # TODO: VERSION file is omnipresent BUILD_DOCDIR ?= $(TOPDIR)/doc -DOCS += $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html) +DOCS += $(wildcard VERSION README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html) DOCSUBDIRS += $(wildcard html tex info examples src) INSTALLED_VERSION_FILE = $(PREFIX)/VERSION INSTALL_DOCDIR = $(DOC_PREFIX) @@ -223,18 +224,29 @@ INSTALLED_LIB = $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) # -- EXE -BUILD_EXEDIR = $(TOPDIR)/bin EXE_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*) -SHSCRIPTS += $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl)) -SCRIPTS += $(patsubst %.tmpl,%,$(wildcard *.tmpl)) -EXE_SH += $(wildcard *.sh *.pl) BUILD_EXE_BIN += $(addprefix $(BUILD_EXEDIR)/,$(EXE)) -BUILD_EXE_SH += $(patsubst %.sh,$(BUILD_EXEDIR)/%.sh,$(EXE_SH)) -BUILD_EXE += $(BUILD_EXE_BIN) $(BUILD_EXE_SH) -INSTALLED_EXE_SH += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_SH)) INSTALLED_EXE_BIN += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_BIN)) + +BUILD_EXEDIR = $(TOPDIR)/bin INSTALL_EXEDIR ?= $(EXE_PREFIX)/bin -INSTALLED_EXE += $(INSTALL_EXEDIR)/$(EXE) $(INSTALLED_EXE_SH) $(INSTALLED_EXE_BIN) +BUILD_EXE += $(BUILD_EXE_BIN) +INSTALLED_EXE += $(INSTALL_EXEDIR)/$(EXE) $(INSTALLED_EXE_BIN) + +# -- SCRIPT +EXE_SH += $(wildcard *.sh *.pl) +EXE_SH += $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl)) + +BUILD_SCRIPTDIR = $(TOPDIR)/bin +INSTALL_SCRIPTDIR = $(EXE_PREFIX)/bin +BUILD_SCRIPT += $(patsubst %.sh,$(BUILD_SCRIPTDIR)/%.sh,$(EXE_SH)) +INSTALLED_SCRIPT += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_SH)) + +# -- INIT +BUILD_INITDIR = $(TOPDIR)/bin +INSTALL_INITDIR = $(INIT_PREFIX)/init.d +BUILD_INIT += $(addprefix $(BUILD_INITDIR)/,$(INIT_SCRIPTS)) +INSTALLED_INIT += $(addprefix $(INSTALL_INITDIR)/,$(INIT_SCRIPTS)) # -- MAKE BUILD_MAKEDIR = $(TOPDIR)/make