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

make: Shifted site installation makefile definitions into $(SITE_DIR)/make/site.mk

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-28 02:00:24 +00:00
commit 298f35647f
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/conf.mk
View file

@ -4,7 +4,7 @@ include $(MODDIR)/make/rules.mk
all:
clean: clean.conf
install: install_CFG install_SYSCFG install_LOGROT install_CRONTAB install_RSYSLOG \
install_APACHE_CONF install_SITE install_SYSTEMD $(CONF_D)
install_APACHE_CONF install_SYSTEMD $(CONF_D)
clean.conf:
rm -rf *.h *~ .*.swp *.done

21
make/defs.mk
View file

@ -494,15 +494,6 @@ INSTALL_APACHE_CONFDIR = $(APACHE_CONF_DIR)
INSTALLED_APACHE_CONF = $(addprefix $(INSTALL_APACHE_CONFDIR)/,$(patsubst %.apache-conf,%.conf,$(APACHE_CONF)))
endif
# -- SITE
ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += SITE
SITE += $(filter-out $(DONT_INSTALL),$(wildcard *.site))
BUILD_SITEDIR = $(TOPDIR)/bin/site/modules.d
INSTALL_SITEDIR = $(SITE_MODULES_DIR)
INSTALLED_SITE = $(addprefix $(INSTALL_SITEDIR)/,$(patsubst %.site,%.conf,$(SITE)))
endif
# -- RSYSLOG
ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += RSYSLOG
@ -869,6 +860,18 @@ endif
# -- use of supplementary libraries
ifneq ($(filter site,$(PREREQ_BUILD)),)
SITE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/site /opt/$(FLAVOUR_PATH_PREFIX)site))
SITE_VERSION = $(call version,$(SITE_DIR))
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)site-run = $(SITE_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)site-devel = $(SITE_VERSION)
PREREQ_BUILD += ytools
#INCLUDE += -I$(SITE_DIR)/include
#LIBFLAGS += -L$(SITE_DIR)/lib -lsite
#EXE_SEARCH_PATH += $(SITE_DIR)/bin
PREREQ += SITE
endif
ifneq ($(filter jux2,$(PREREQ_BUILD)),)
JUX2_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux2 /opt/$(FLAVOUR_PATH_PREFIX)jux2))
JUX2_VERSION = $(call version,$(JUX2_DIR))

2
make/rpmdist.mk
View file

@ -68,7 +68,7 @@ unexport RPM_VERSION VERSION DIST_SRC_DIR
include $(MODDIR)/make/tag-rules.mk
include $(MODDIR)/make/upload-rules.mk
BUILD_PACKAGE_SH = /bin/bash $(MOD_SCRIPT_DIR)/build-package.sh \
BUILD_PACKAGE_SH = /bin/bash -x $(MOD_SCRIPT_DIR)/build-package.sh \
-N $(RPM_PROJECT) \
-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \
-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR)

3
make/rules.mk
View file

@ -312,9 +312,6 @@ $(INSTALL_LOGROTDIR)/%: %.logrotate | install_dir_LOGROT
$(INSTALL_APACHE_CONFDIR)/%.conf: %.apache-conf | install_dir_APACHE_CONF
$(INSTALL) -o $(APACHE_CONFOWNER) -g $(APACHE_CONFGROUP) -m $(APACHE_CONFMODE) $< $@
$(INSTALL_SITEDIR)/%.conf: %.site | install_dir_SITE
$(INSTALL) -o $(SITEOWNER) -g $(SITEGROUP) -m $(SITEMODE) $< $@
$(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog | install_dir_RSYSLOG
$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@