From f9f437496df28b32484105e31dfc7776fcbd1bad Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 1 Mar 2019 11:08:34 +0000 Subject: [PATCH] defs.mk: Somewhat more consistent indentation of conditionals Signed-off-by: Jan Lindemann --- make/defs.mk | 80 ++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 91280cb9..31a18b57 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -367,12 +367,12 @@ REQUIRED := $(CONTRIB_MOD) $(REQUIRED) ifeq ($(DEVELOPMENT),true) -include $(MODDIR)/make/defs-dev.mk ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),) - -include $(TOPDIR)/make/cfg_dev.mk + -include $(TOPDIR)/make/cfg_dev.mk endif else -include $(MODDIR)/make/defs-dist.mk ifneq ($(wildcard $(TOPDIR)/make/cfg_dist.mk),) - -include $(TOPDIR)/make/cfg_dist.mk + -include $(TOPDIR)/make/cfg_dist.mk endif endif @@ -388,9 +388,9 @@ CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) BUILD_CFGDIR = $(TOPDIR)/conf ifeq ($(CONFIG_SUBDIR),) -INSTALL_CFGDIR ?= $(CONFIG_DIR) + INSTALL_CFGDIR ?= $(CONFIG_DIR) else -INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR) + INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR) endif 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)) @@ -523,64 +523,64 @@ INSTALLED_JAVA ?= $(addprefix $(INSTALL_JAVADIR)/,$(JAVA_JARS)) # -- LD_CONF INSTALLATION_FILE_TYPES += LD_CONF ifneq ($(TARGET),mingw) -LD_CONF += $(filter-out $(DONT_INSTALL),ld-$(PROJECT).conf) -BUILD_LD_CONFDIR = $(TOPDIR)/lib/ld.so.conf.d -INSTALL_LD_CONFDIR = $(LD_CONF_DIR) -INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF)) + LD_CONF += $(filter-out $(DONT_INSTALL),ld-$(PROJECT).conf) + BUILD_LD_CONFDIR = $(TOPDIR)/lib/ld.so.conf.d + INSTALL_LD_CONFDIR = $(LD_CONF_DIR) + INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF)) endif # -- LOGROT ifneq ($(TARGET),mingw) -INSTALLATION_FILE_TYPES += LOGROT -LOGROT += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.logrotate))) -BUILD_LOGROTDIR = $(TOPDIR)/bin/logrotate.d -INSTALL_LOGROTDIR = $(LOGROT_DIR) -INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) + INSTALLATION_FILE_TYPES += LOGROT + LOGROT += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.logrotate))) + BUILD_LOGROTDIR = $(TOPDIR)/bin/logrotate.d + INSTALL_LOGROTDIR = $(LOGROT_DIR) + INSTALLED_LOGROT = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT)) endif # -- APACHE_CONF ifneq ($(TARGET),mingw) -INSTALLATION_FILE_TYPES += APACHE_CONF -APACHE_CONF += $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf)) -BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d -INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR) -INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF))) + INSTALLATION_FILE_TYPES += APACHE_CONF + APACHE_CONF += $(filter-out $(DONT_INSTALL),$(wildcard *.apache-conf)) + BUILD_APACHE_CONFDIR = $(TOPDIR)/bin/apache/conf.d + INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR) + INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF))) endif # -- RSYSLOG ifneq ($(TARGET),mingw) -INSTALLATION_FILE_TYPES += RSYSLOG -RSYSLOG += $(filter-out $(DONT_INSTALL),$(wildcard *.rsyslog rsyslog-*.bprof)) -BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d -INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR) -INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(subst rsyslog-,,$(RSYSLOG))) -INSTALLED_RSYSLOG += $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG))) + INSTALLATION_FILE_TYPES += RSYSLOG + RSYSLOG += $(filter-out $(DONT_INSTALL),$(wildcard *.rsyslog rsyslog-*.bprof)) + BUILD_RSYSLOGDIR = $(TOPDIR)/bin/rsyslog.d + INSTALL_RSYSLOGDIR = $(RSYSLOG_DIR) + INSTALLED_RSYSLOG = $(addprefix $(INSTALL_RSYSLOGDIR)/,$(subst rsyslog-,,$(RSYSLOG))) + INSTALLED_RSYSLOG += $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(RSYSLOG))) endif # -- CRONTAB ifneq ($(TARGET),mingw) -INSTALLATION_FILE_TYPES += CRONTAB -CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab)) -BUILD_CRONTABDIR = $(TOPDIR)/cron.d -INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB)) + INSTALLATION_FILE_TYPES += CRONTAB + CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab)) + BUILD_CRONTABDIR = $(TOPDIR)/cron.d + INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB)) endif # -- PKG_CONFIG ifneq ($(TARGET),mingw) -INSTALLATION_FILE_TYPES += PKG_CONFIG -PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG))) -ifeq ($(DEVELOPMENT),true) -BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig -else -BUILD_PKG_CONFIGDIR = $(TOPDIR)/make -endif -LOCAL_PKG_CONFIG = $(PROJECT).pc -BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG) -INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG)) + INSTALLATION_FILE_TYPES += PKG_CONFIG + PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG))) + ifeq ($(DEVELOPMENT),true) + BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig + else + BUILD_PKG_CONFIGDIR = $(TOPDIR)/make + endif + LOCAL_PKG_CONFIG = $(PROJECT).pc + BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG) + INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG)) endif -INSTALL_FILE ?= $(INSTALL) -INSTALL_DIR ?= $(INSTALL) +INSTALL_FILE ?= $(INSTALL) +INSTALL_DIR ?= $(INSTALL) # ----- local.mk