make: Fix CONFIG_SUBDIR

The existence of CONFIG_SUBDIR hijacks INSTALL_CFGDIR to a subdirectory (by
default /etc/opt/<package>/$(CONFIG_SUBDIR)). Then std_install_rules apply,
and (the bent) INSTALL_CFGDIR is installed, but its parent directory, the
original $(INSTALL_CFGDIR), is not a prerequisite of install anylonger, and
has no rule anymore, hence log-install is never run for it. Instead it's
implicitly created by log-install -D $(INSTALL_CFGDIR).

This commit gives /etc/opt/<package> std-install rule and variables back as
CFGTOPDIR variants, and inserts it early into the install target's
prerequisite list.

Signed-off-by: Jan Lindemann <jan@janware.com>

make/conf.mk

@@ -4,15 +4,26 @@ include $(JWBDIR)/make/dev-utils.mk
 
 all:
 clean: clean.conf
-install: install_CFG install_files_SYSCFG install_files_LOGROT install_files_CRONTAB install_files_RSYSLOG \
-	install_files_APACHE_CONF install_files_SYSTEMD install_files_INIT install_files_TMPFILES $(CONF_D)
+install: \
+	$(INSTALL_CFGTOPDIR) \
+	install_CFG \
+	install_files_SYSCFG \
+	install_files_LOGROT \
+	install_files_CRONTAB \
+	install_files_RSYSLOG \
+	install_files_APACHE_CONF \
+	install_files_SYSTEMD \
+	install_files_INIT \
+	install_files_TMPFILES \
+	$(CONF_D)
 test: all
 
 clean.conf:
 	$(RM) -rf *~ .*.swp *.done
 
-ifneq ($(CONFIG_SUBDIR),)
-$(INSTALLED_CFG): $(INSTALL_CFGDIR)
+ifneq ($(INSTALL_CFGTOPDIR),)
+$(INSTALL_CFGTOPDIR):
+	$(INSTALL) -D -d -m $(CFGTOPDIRMODE) -o $(CFGTOPDIROWNER) -g $(CFGTOPDIRGROUP) $@
 endif
 
 ifneq ($(CONF_D),)

make/defs-dev.mk

@@ -31,6 +31,7 @@ LOG_PREFIX                  ?= $(PREFIX)/log
 JAVA_PREFIX                 ?= $(PREFIX)
 HDR_SCOPE_PREFIX            ?=
 
+INSTALL_PREFIXDIR           ?= $(PREFIX)
 DATA_DIR                    ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/data
 IMAGEDIR                    ?= $(DATA_DIR)/images
 JSON_DIR                    ?= $(DATA_DIR)/json
@@ -71,6 +72,9 @@ CFGMODE                     ?= 660
 CFGDIROWNER                 ?= $(EXEDIROWNER)
 CFGDIRGROUP                 ?= $(EXEDIRGROUP)
 CFGDIRMODE                  ?= $(EXEDIRMODE)
+CFGTOPDIROWNER              ?= $(CFGDIROWNER)
+CFGTOPDIRGROUP              ?= $(CFGDIRGROUP)
+CFGTOPDIRMODE               ?= $(CFGDIRMODE)
 SYSCFGOWNER                 ?= $(CFGOWNER)
 SYSCFGGROUP                 ?= $(CFGGROUP)
 SYSCFGMODE                  ?= $(CFGMODE)

make/defs-dist.mk

@@ -31,6 +31,7 @@ LOG_PREFIX                  ?= $(ENV_PREFIX)/var/log
 JAVA_PREFIX                 ?= $(PREFIX)
 HDR_SCOPE_PREFIX            ?=
 
+INSTALL_PREFIXDIR           ?= $(PREFIX)
 DATA_DIR                    ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/data
 IMAGEDIR                    ?= $(DATA_DIR)/images
 JSON_DIR                    ?= $(DATA_DIR)/json
@@ -71,6 +72,9 @@ CFGMODE                     ?= 664
 CFGDIROWNER                 ?= $(EXEDIROWNER)
 CFGDIRGROUP                 ?= $(EXEDIRGROUP)
 CFGDIRMODE                  ?= $(EXEDIRMODE)
+CFGTOPDIROWNER              ?= $(CFGDIROWNER)
+CFGTOPDIRGROUP              ?= $(CFGDIRGROUP)
+CFGTOPDIRMODE               ?= $(CFGDIRMODE)
 SYSCFGOWNER                 ?= $(CFGOWNER)
 SYSCFGGROUP                 ?= $(CFGGROUP)
 SYSCFGMODE                  ?= $(CFGMODE)

make/defs.mk

@@ -307,6 +307,8 @@ LOCAL_MKFILES               ?= $(wildcard GNUmakefile makefile Makefile *.mk)
 LOG_QUAL_PREFIX             ?= $(LOGID):
 
 # -- standard dirs and files for build and install
+INSTALLATION_FILE_TYPES     += PREFIX
+
 # -- CFG
 INSTALLATION_FILE_TYPES     += CFG
 CONFIG_FILE                 ?= $(CONFIG_DIR)/$(PROJECT).conf
@@ -314,6 +316,7 @@ BUILD_CFGDIR                 = $(TOPDIR)/conf
 ifeq ($(CONFIG_SUBDIR),)
   INSTALL_CFGDIR            ?= $(CONFIG_DIR)
 else
+  INSTALL_CFGTOPDIR         ?= $(CONFIG_DIR)
   INSTALL_CFGDIR            ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR)
 endif
 LOCAL_CFG                   ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl *.ini *.yaml *.toml))) $(LOCAL_EXTRA_CFG)

make/include.mk

@@ -8,7 +8,7 @@ SRC_H                       += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h)
 # mandatory targets
 all: $(PROJ_H)
 clean: clean.include
-install: install_HDR
+install: install_dir_PREFIX install_HDR
 
 # not wäry naaice
 ifneq ($(HDRDIR_SCOPE_SUFFIX),)

make/make.mk

@@ -31,7 +31,7 @@ endif
 ifeq ($(CREATE_PKG_CONFIG),true)
 all: build_PKG_CONFIG
 endif
-install: $(DEVEL_TARGETS)
+install: install_dir_PREFIX $(DEVEL_TARGETS)
 clean: textclean localclean doneclean clean.pkg-config
 test: all
 

make/scripts-targets.mk

@@ -1,5 +1,5 @@
 all: build_EXE build_CGI
-install: install_files_INIT install_EXE install_files_CGI install_files_SYSCFG
+install: install_dir_PREFIX install_files_INIT install_EXE install_files_CGI install_files_SYSCFG
 clean:allclean localclean doneclean textclean clean.init
 test: all
 

make/so.mk

@@ -18,7 +18,7 @@ include $(JWBDIR)/make/rules.mk
 
 all: $(SHOBJS) $(BUILD_SHOBJS)
 clean: objclean textclean localclean profclean
-install: $(ALL) install_dir_LIB installso
+install: $(ALL) install_dir_PREFIX install_dir_LIB installso
 
 $(BUILD_LIBDIR)/%.so: %.so
 	install -m 755 $< $@

make/yapp.mk

@@ -13,7 +13,7 @@ endif
 include $(JWBDIR)/make/exe.mk
 
 all: build_EXE
-install: install_EXE
+install: install_dir_PREFIX install_EXE
 clean: clean.yapp
 distclean: