defs.mk, rules.mk: Define INSTALLATION_FILE_TYPES decentrally

make/defs.mk

@@ -249,6 +249,7 @@ IMAGES                += $(wildcard *.png *.jpg *.bmp *.gif)
 # -- standard dirs and files for build and install
 
 # -- CFG
+INSTALLATION_FILE_TYPES += CFG
 CONFIG_FILE           ?= $(CONFIG_DIR)/$(PROJECT).conf
 SYSCFG_FILE           ?= $(SYSCFG_DIR)/$(PROJECT)
 BUILD_CFGDIR           = $(TOPDIR)/conf
@@ -261,6 +262,7 @@ LOCAL_CFG             ?= $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof
 INSTALLED_CFG         ?= $(addprefix $(INSTALL_CFGDIR)/,$(LOCAL_CFG))
 
 # -- SYSCFG
+INSTALLATION_FILE_TYPES += SYSCFG
 SYSCFG_FILES          += $(basename $(wildcard *.sysconf))
 BUILD_SYSCFG           = $(TOPDIR)/conf
 BUILD_SYSCFGDIR        = $(BUILD_SYSCFG)
@@ -268,6 +270,7 @@ INSTALL_SYSCFGDIR     ?= $(SYSCFG_DIR)
 INSTALLED_SYSCFG      ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES))
 
 # -- HDR
+INSTALLATION_FILE_TYPES += HDR
 BUILD_HDRDIR          ?= $(TOPDIR)/include/$(HDRDIR_SCOPE_SUFFIX)
 SRC_H                 += $(filter %.h %.H, $(SRC_ALL_CPP))
 BUILD_H                = $(addprefix $(BUILD_HDRDIR)/,$(SRC_H))
@@ -276,6 +279,7 @@ INSTALL_HDRDIR        ?= $(PREFIX)/include
 INSTALLED_HDR         += $(addprefix $(INSTALL_HDRDIR)/,$(SRC_H))
 
 # -- DOC
+INSTALLATION_FILE_TYPES += DOC
 DOCS                  += $(wildcard VERSION README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html)
 DOCSUBDIRS            += $(wildcard html tex info examples src)
 
@@ -287,7 +291,7 @@ INSTALL_DOCDIR        ?= $(PREFIX)
 INSTALLED_DOC         ?= $(addprefix $(INSTALL_DOCDIR)/,$(DOCS))
 
 # -- LIB
-
+INSTALLATION_FILE_TYPES += LIB
 #BUILD_PIDIR            = $(BUILD_LIBDIR)
 #BUILD_PI               = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN))
 #INSTALL_PIDIR          = $(INSTALL_LIBDIR)
@@ -351,6 +355,7 @@ BUILD_LIB             += $(LIB_SO)
 #INSTALLED_PI           = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN))
 
 # -- EXE
+INSTALLATION_FILE_TYPES += EXE
 EXE_SH                += $(wildcard *.sh *.pl *.pm *.py *.bat)
 EXE_SH                += $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
 
@@ -364,13 +369,14 @@ BUILD_EXE             += $(BUILD_EXE_BIN)
 INSTALLED_EXE         += $(addprefix $(INSTALL_EXEDIR)/,$(EXE) $(EXE_SH)) $(INSTALLED_EXE_BIN)
 
 # -- SCRIPT
-
+#INSTALLATION_FILE_TYPES += SCRIPT
 #BUILD_SCRIPTDIR        = $(TOPDIR)/bin
 #INSTALL_SCRIPTDIR     ?= $(EXE_PREFIX)/bin
 #BUILD_SCRIPT          += $(addprefix $(BUILD_SCRIPTDIR)/,$(EXE_SH))
 #INSTALLED_SCRIPT      += $(addprefix $(INSTALL_SCRIPTDIR)/,$(EXE_SH))
 
 # -- CGI
+INSTALLATION_FILE_TYPES += CGI
 EXE_CGI               += $(wildcard *.cgi)
 EXE_CGI               += $(patsubst %.cgi.tmpl,%.cgi,$(wildcard *.cgi.tmpl))
 
@@ -380,6 +386,7 @@ BUILD_CGI             += $(addprefix $(BUILD_CGIDIR)/,$(EXE_CGI))
 INSTALLED_CGI         += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
 
 # -- HTML
+INSTALLATION_FILE_TYPES += HTML
 BUILD_HTMLDIR          = $(TOPDIR)/htdocs
 LOCAL_HTML            += $(wildcard *.html *.css *.php) $(IMAGES)
 HTML_SUBDIR           ?= $(shell pwd | $(SED) 's%.*/htdocs/%%')
@@ -391,6 +398,7 @@ endif
 INSTALLED_HTML        += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML))
 
 # -- INIT
+INSTALLATION_FILE_TYPES += INIT
 BUILD_INITDIR          = $(TOPDIR)/bin
 INSTALL_INITDIR        = $(INIT_PREFIX)/init.d
 _INIT_SCRIPTS          = $(basename $(wildcard *.init))
@@ -399,24 +407,28 @@ BUILD_INIT            += $(addprefix $(BUILD_INITDIR)/,$(INIT_SCRIPTS))
 INSTALLED_INIT        += $(addprefix $(INSTALL_INITDIR)/,$(INIT_SCRIPTS))
 
 # -- MAKE
+INSTALLATION_FILE_TYPES += MAKE
 BUILD_MAKEDIR          = $(TOPDIR)/make
 MKFILES               += $(filter-out pckg-defs.mk pckg-deps.mk local.mk,$(wildcard *.mk))
 INSTALL_MAKEDIR       ?= $(PREFIX)/make
 INSTALLED_MAKE        += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES))
 
 # -- IMG
+INSTALLATION_FILE_TYPES += IMG
 BUILD_IMG             ?= 
 BUILD_IMGDIR          ?= $(TOPDIR)/images
 INSTALL_IMGDIR        ?= $(IMG_PREFIX)/images
 INSTALLED_IMG         ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES))
 
 # -- LOG
+INSTALLATION_FILE_TYPES += LOG
 BUILD_LOGDIR          ?= $(TOPDIR)/log
 BUILD_LOG             ?= 
 INSTALL_LOGDIR        ?= $(LOG_PREFIX)/$(PROJECT)
 INSTALLED_LOG         ?= 
 
 # -- PROFILE
+INSTALLATION_FILE_TYPES += PROFILE
 # TODO: path_ file is omnipresent
 BUILD_PROFILEDIR       = $(TOPDIR)/profile.d
 #PROFILE               += path_$(PROJECT).sh
@@ -424,6 +436,7 @@ INSTALL_PROFILEDIR    ?= $(PROFILE_DIR)
 INSTALLED_PROFILE     ?= $(addprefix $(INSTALL_PROFILEDIR)/,$(PROFILE))
 
 # -- JAVA
+INSTALLATION_FILE_TYPES += JAVA
 BUILD_JAVADIR           = $(TOPDIR)/share/java
 BUILD_JAVADIR_CLASSES   = classes
 JAVA_JARS              ?= $(wildcard *.jar)
@@ -431,6 +444,7 @@ INSTALL_JAVADIR        ?= $(JAVADIR)
 INSTALLED_JAVA         ?= $(addprefix $(INSTALL_JAVADIR)/,$(JAVA_JARS))
 
 # -- LD_CONF
+INSTALLATION_FILE_TYPES += LD_CONF
 ifneq ($(TARGET),mingw)
 LD_CONF            += ld-$(PROJECT).conf
 BUILD_LD_CONFDIR    = $(TOPDIR)/lib/ld.so.conf.d
@@ -440,6 +454,7 @@ endif
 
 # -- LOGROT
 ifneq ($(TARGET),mingw)
+INSTALLATION_FILE_TYPES += LOGROT
 LOGROT            += $(basename $(wildcard *.logrotate))
 BUILD_LOGROTDIR    = $(TOPDIR)/bin/logrotate.d
 INSTALL_LOGROTDIR  = $(LOGROT_DIR)
@@ -448,6 +463,7 @@ endif
 
 # -- RSYSLOG
 ifneq ($(TARGET),mingw)
+INSTALLATION_FILE_TYPES += RSYSLOG
 RSYSLOG           += $(wildcard *.rsyslog rsyslog-*.bprof)
 BUILD_RSYSLOGDIR   = $(TOPDIR)/bin/rsyslog.d
 INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR)
@@ -457,6 +473,7 @@ endif
 
 # -- CRONTAB
 ifneq ($(TARGET),mingw)
+INSTALLATION_FILE_TYPES += CRONTAB
 CRONTAB             += $(wildcard *.crontab)
 BUILD_CRONTABDIR    = $(TOPDIR)/cron.d
 INSTALLED_CRONTAB   = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB))

make/rules.mk

@@ -278,9 +278,6 @@ check_not_empty_$(1):
 	fi
 endef
 
-INSTALLATION_FILE_TYPES += LIB HDR EXE INIT DOC PROFILE MAKE CFG \
-	SYSCFG IMG LOG JAVA LD_CONF CGI LOGROT RSYSLOG CRONTAB HTML
-
 #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\
 #	$(eval $(call std_install_rules,$(type)$(attr)))))
 
@@ -368,4 +365,3 @@ core-pattern:
 	echo core.%e.%p | sudo tee /proc/sys/kernel/core_pattern
 #$(SYSCFG_DIR)/%: %
 #	$(INSTALL) -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@
-