From bd3c6a348dd9d54e4e1cf6c646ba253a9d34611e Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Tue, 13 Aug 2013 15:22:00 +0000
Subject: [PATCH] defs.mk: Add support for DONT_INSTALL

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs.mk | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 84846614..66b4ae58 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -367,8 +367,8 @@ BUILD_LIB             += $(LIB_SO)
 
 # -- EXE
 INSTALLATION_FILE_TYPES += EXE
-EXE_SH                += $(wildcard *.sh *.pl *.pm *.py *.bat)
-EXE_SH                += $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
+EXE_SH                += $(filter-out $(DONT_INSTALL),$(wildcard *.sh *.pl *.pm *.py *.bat))
+EXE_SH                += $(patsubst %.sh.tmpl,%.sh,$(filter-out $(DONT_INSTALL),$(wildcard *.sh.tmpl)))
 
 #EXE_ALL               += $(EXE) $(wildcard *.a *.dll *.so *.so.*)
 BUILD_EXE_BIN         += $(addprefix $(BUILD_EXEDIR)/,$(EXE) $(EXE_SH))
@@ -388,8 +388,8 @@ INSTALLED_EXE         += $(addprefix $(INSTALL_EXEDIR)/,$(EXE) $(EXE_SH)) $(INST
 
 # -- CGI
 INSTALLATION_FILE_TYPES += CGI
-EXE_CGI               += $(wildcard *.cgi)
-EXE_CGI               += $(patsubst %.cgi.tmpl,%.cgi,$(wildcard *.cgi.tmpl))
+EXE_CGI               += $(filter-out $(DONT_INSTALL),$(wildcard *.cgi))
+EXE_CGI               += $(patsubst %.cgi.tmpl,%.cgi,$(filter-out $(DONT_INSTALL),$(wildcard *.cgi.tmpl)))
 
 BUILD_CGIDIR           = $(TOPDIR)/bin
 INSTALL_CGIDIR         = $(CGI_DIR)
@@ -399,7 +399,7 @@ INSTALLED_CGI         += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
 # -- HTML
 INSTALLATION_FILE_TYPES += HTML
 BUILD_HTMLDIR          = $(TOPDIR)/htdocs
-LOCAL_HTML            += $(wildcard *.html *.css *.php) $(IMAGES)
+LOCAL_HTML            += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php) $(IMAGES))
 HTML_SUBDIR           ?= $(shell pwd | $(SED) 's%.*/htdocs/%%')
 ifeq ($(HTML_SUBDIR),)
 INSTALL_HTMLDIR        = $(PROJECT_HTMLDIR)
@@ -412,7 +412,7 @@ INSTALLED_HTML        += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML))
 INSTALLATION_FILE_TYPES += INIT
 BUILD_INITDIR          = $(TOPDIR)/bin
 INSTALL_INITDIR        = $(INIT_PREFIX)/init.d
-_INIT_SCRIPTS          = $(basename $(wildcard *.init))
+_INIT_SCRIPTS          = $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.init)))
 INIT_SCRIPTS          += $(_INIT_SCRIPTS)
 BUILD_INIT            += $(addprefix $(BUILD_INITDIR)/,$(INIT_SCRIPTS))
 INSTALLED_INIT        += $(addprefix $(INSTALL_INITDIR)/,$(INIT_SCRIPTS))
@@ -420,7 +420,7 @@ 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))
+MKFILES               += $(filter-out pckg-defs.mk pckg-deps.mk local.mk,$(filter-out $(DONT_INSTALL),$(wildcard *.mk)))
 INSTALL_MAKEDIR       ?= $(PREFIX)/make
 INSTALLED_MAKE        += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES))
 
@@ -450,14 +450,14 @@ INSTALLED_PROFILE     ?= $(addprefix $(INSTALL_PROFILEDIR)/,$(PROFILE))
 INSTALLATION_FILE_TYPES += JAVA
 BUILD_JAVADIR           = $(TOPDIR)/share/java
 BUILD_JAVADIR_CLASSES   = classes
-JAVA_JARS              ?= $(wildcard *.jar)
+JAVA_JARS              ?= $(filter-out $(DONT_INSTALL),$(wildcard *.jar))
 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
+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))
@@ -466,7 +466,7 @@ endif
 # -- LOGROT
 ifneq ($(TARGET),mingw)
 INSTALLATION_FILE_TYPES += LOGROT
-LOGROT            += $(basename $(wildcard *.logrotate))
+LOGROT            += $(basename $(filter-out $(DONT_INSTALL),$(wildcard *.logrotate)))
 BUILD_LOGROTDIR    = $(TOPDIR)/bin/logrotate.d
 INSTALL_LOGROTDIR  = $(LOGROT_DIR)
 INSTALLED_LOGROT   = $(addprefix $(INSTALL_LOGROTDIR)/,$(LOGROT))
@@ -475,17 +475,17 @@ endif
 # -- RSYSLOG
 ifneq ($(TARGET),mingw)
 INSTALLATION_FILE_TYPES += RSYSLOG
-RSYSLOG           += $(wildcard *.rsyslog rsyslog-*.bprof)
+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-,,$(wildcard rsyslog-*)))
-INSTALLED_RSYSLOG += $(addprefix $(INSTALL_RSYSLOGDIR)/,$(patsubst %.rsyslog,%.conf,$(wildcard *.rsyslog)))
+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             += $(wildcard *.crontab)
+CRONTAB             += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab))
 BUILD_CRONTABDIR    = $(TOPDIR)/cron.d
 INSTALLED_CRONTAB   = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB))
 endif
@@ -493,7 +493,7 @@ endif
 # -- PKG_CONFIG
 ifneq ($(TARGET),mingw)
 INSTALLATION_FILE_TYPES += PKG_CONFIG
-PKG_CONFIG             += $(wildcard *.pc)
+PKG_CONFIG             += $(filter-out $(DONT_INSTALL),$(wildcard *.pc))
 BUILD_PKG_CONFIGDIR    = $(MODDIR)/pkgconfig
 INSTALLED_PKG_CONFIG   = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG))
 endif