make: Support INSTALL_PREFIXDIR

During "make install", the packaging machinery should run "$(LOG_INSTALL)
-D /opt/<pkg>" but runs "mkdir -p /opt/<pkg>" instead. As a consequence,
the created directory is not owned by any of the created packages. This
commit fixes that by introducing INSTALL_PREFIXDIR and installing it like
all other directories.

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

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

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

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

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: