janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 15:03:55 +01:00
Code Activity

defs.mk: Somewhat more consistent indentation of conditionals

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-01 11:08:34 +00:00
commit f9f437496d
1 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

80
make/defs.mk
View file

@ -367,12 +367,12 @@ REQUIRED := $(CONTRIB_MOD) $(REQUIRED)
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
-include $(MODDIR)/make/defs-dev.mk -include $(MODDIR)/make/defs-dev.mk
ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),) ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),)
-include $(TOPDIR)/make/cfg_dev.mk -include $(TOPDIR)/make/cfg_dev.mk
endif endif
else else
-include $(MODDIR)/make/defs-dist.mk -include $(MODDIR)/make/defs-dist.mk
ifneq ($(wildcard $(TOPDIR)/make/cfg_dist.mk),) ifneq ($(wildcard $(TOPDIR)/make/cfg_dist.mk),)
-include $(TOPDIR)/make/cfg_dist.mk -include $(TOPDIR)/make/cfg_dist.mk
endif endif
endif endif
@ -388,9 +388,9 @@ CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf
SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT)
BUILD_CFGDIR = $(TOPDIR)/conf BUILD_CFGDIR = $(TOPDIR)/conf
ifeq ($(CONFIG_SUBDIR),) ifeq ($(CONFIG_SUBDIR),)
INSTALL_CFGDIR ?= $(CONFIG_DIR) INSTALL_CFGDIR ?= $(CONFIG_DIR)
else else
INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR) INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR)
endif endif
LOCAL_CFG ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl *.ini))) $(LOCAL_EXTRA_CFG) LOCAL_CFG ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl *.ini))) $(LOCAL_EXTRA_CFG)
INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(LOCAL_CFG)) INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(LOCAL_CFG))
@ -523,64 +523,64 @@ INSTALLED_JAVA ?= $(addprefix $(INSTALL_JAVADIR)/,$(JAVA_JARS))
# -- LD_CONF # -- LD_CONF
INSTALLATION_FILE_TYPES += LD_CONF INSTALLATION_FILE_TYPES += LD_CONF
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
LD_CONF += $(filter-out $(DONT_INSTALL),ld-$(PROJECT).conf) LD_CONF += $(filter-out $(DONT_INSTALL),ld-$(PROJECT).conf)
BUILD_LD_CONFDIR = $(TOPDIR)/lib/ld.so.conf.d BUILD_LD_CONFDIR = $(TOPDIR)/lib/ld.so.conf.d
INSTALL_LD_CONFDIR = $(LD_CONF_DIR) INSTALL_LD_CONFDIR = $(LD_CONF_DIR)
INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF)) INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF))
endif endif
# -- LOGROT # -- LOGROT
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += LOGROT INSTALLATION_FILE_TYPES += LOGROT
LOGROT += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.logrotate))) LOGROT += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.logrotate)))
BUILD_LOGROTDIR = $(TOPDIR)/bin/logrotate.d BUILD_LOGROTDIR = $(TOPDIR)/bin/logrotate.d
INSTALL_LOGROTDIR = $(LOGROT_DIR) INSTALL_LOGROTDIR = $(LOGROT_DIR)
INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT))
endif endif
# -- APACHE_CONF # -- APACHE_CONF
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += APACHE_CONF INSTALLATION_FILE_TYPES += APACHE_CONF
APACHE_CONF += $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf)) APACHE_CONF += $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf))
BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d
INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR) INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR)
INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF))) INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF)))
endif endif
# -- RSYSLOG # -- RSYSLOG
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += RSYSLOG INSTALLATION_FILE_TYPES += RSYSLOG
RSYSLOG += $(filter-out $(DONT_INSTALL),$(wildcard *.rsyslog rsyslog-*.bprof)) RSYSLOG += $(filter-out $(DONT_INSTALL),$(wildcard *.rsyslog rsyslog-*.bprof))
BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d
INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR) INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR)
INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(subst rsyslog-,,$(RSYSLOG))) INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(subst rsyslog-,,$(RSYSLOG)))
INSTALLED_RSYSLOG += $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG))) INSTALLED_RSYSLOG += $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG)))
endif endif
# -- CRONTAB # -- CRONTAB
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += CRONTAB INSTALLATION_FILE_TYPES += CRONTAB
CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab)) CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab))
BUILD_CRONTABDIR = $(TOPDIR)/cron.d BUILD_CRONTABDIR = $(TOPDIR)/cron.d
INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB)) INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB))
endif endif
# -- PKG_CONFIG # -- PKG_CONFIG
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += PKG_CONFIG INSTALLATION_FILE_TYPES += PKG_CONFIG
PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG))) PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG)))
ifeq ($(DEVELOPMENT),true) ifeq ($(DEVELOPMENT),true)
BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig
else else
BUILD_PKG_CONFIGDIR = $(TOPDIR)/make BUILD_PKG_CONFIGDIR = $(TOPDIR)/make
endif endif
LOCAL_PKG_CONFIG = $(PROJECT).pc LOCAL_PKG_CONFIG = $(PROJECT).pc
BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG) BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG)
INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG)) INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG))
endif endif
INSTALL_FILE ?= $(INSTALL) INSTALL_FILE ?= $(INSTALL)
INSTALL_DIR ?= $(INSTALL) INSTALL_DIR ?= $(INSTALL)
# ----- local.mk # ----- local.mk