janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 13:47:39 +01:00
Code Activity

make: (hopefully) added support for .site installation

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-24 19:19:41 +00:00
commit 98b170bceb
5 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/conf.mk
View file

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

7
make/defs-dev.mk
View file

@ -35,6 +35,7 @@ WORKING_DIR ?= $(ENV_PREFIX)$(HOME)
WORKING_DIR ?= $(VAR_PREFIX)/lock WORKING_DIR ?= $(VAR_PREFIX)/lock
JAVADIR ?= $(JAVA_PREFIX)/share/java JAVADIR ?= $(JAVA_PREFIX)/share/java
PROJECT_HTMLDIR ?= $(HTDOCS_PREFIX)/proj/$(PROJECT) PROJECT_HTMLDIR ?= $(HTDOCS_PREFIX)/proj/$(PROJECT)
SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin
# -- misc # -- misc
@ -182,6 +183,12 @@ APACHE_CONFMODE ?= $(CFGDIRMODE)
APACHE_CONFDIROWNER ?= $(CFGDIROWNER) APACHE_CONFDIROWNER ?= $(CFGDIROWNER)
APACHE_CONFDIRGROUP ?= $(CFGDIROWNER) APACHE_CONFDIRGROUP ?= $(CFGDIROWNER)
APACHE_CONFDIRMODE ?= $(CFGDIRMODE) APACHE_CONFDIRMODE ?= $(CFGDIRMODE)
SITEOWNER ?= $(APACHE_CONFOWNER)
SITEGROUP ?= $(APACHE_CONFGROUP)
SITEMODE ?= $(APACHE_CONFMODE)
SITEDIROWNER ?= $(APACHE_CONFDIROWNER)
SITEDIRGROUP ?= $(APACHE_CONFDIROWNER)
SITEDIRMODE ?= $(APACHE_CONFDIRMODE)
RSYSLOGOWNER ?= $(CFGOWNER) RSYSLOGOWNER ?= $(CFGOWNER)
RSYSLOGGROUP ?= $(CFGGROUP) RSYSLOGGROUP ?= $(CFGGROUP)
RSYSLOGMODE ?= $(CFGMODE) RSYSLOGMODE ?= $(CFGMODE)

7
make/defs-dist.mk
View file

@ -35,6 +35,7 @@ WORKING_DIR ?= $(VAR_PREFIX)/coredumps
WORKING_DIR ?= $(VAR_PREFIX)/lock WORKING_DIR ?= $(VAR_PREFIX)/lock
JAVADIR ?= $(JAVA_PREFIX)/share/java JAVADIR ?= $(JAVA_PREFIX)/share/java
PROJECT_HTMLDIR ?= $(HTDOCS_PREFIX)/proj/$(PROJECT) PROJECT_HTMLDIR ?= $(HTDOCS_PREFIX)/proj/$(PROJECT)
SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin
# -- misc # -- misc
@ -183,6 +184,12 @@ APACHE_CONFMODE ?= $(CFGMODE)
APACHE_CONFDIROWNER ?= $(CFGDIROWNER) APACHE_CONFDIROWNER ?= $(CFGDIROWNER)
APACHE_CONFDIRGROUP ?= $(CFGDIROWNER) APACHE_CONFDIRGROUP ?= $(CFGDIROWNER)
APACHE_CONFDIRMODE ?= $(CFGDIRMODE) APACHE_CONFDIRMODE ?= $(CFGDIRMODE)
SITEOWNER ?= $(APACHE_CONFOWNER)
SITEGROUP ?= $(APACHE_CONFGROUP)
SITEMODE ?= $(APACHE_CONFMODE)
SITEDIROWNER ?= $(APACHE_CONFDIROWNER)
SITEDIRGROUP ?= $(APACHE_CONFDIROWNER)
SITEDIRMODE ?= $(APACHE_CONFDIRMODE)
RSYSLOGOWNER ?= $(CFGOWNER) RSYSLOGOWNER ?= $(CFGOWNER)
RSYSLOGGROUP ?= $(CFGGROUP) RSYSLOGGROUP ?= $(CFGGROUP)
RSYSLOGMODE ?= $(CFGMODE) RSYSLOGMODE ?= $(CFGMODE)

9
make/defs.mk
View file

@ -483,6 +483,15 @@ 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
# -- SITE
ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += SITE
SITE += $(basename $(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 # -- RSYSLOG
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += RSYSLOG INSTALLATION_FILE_TYPES += RSYSLOG

3
make/rules.mk
View file

@ -309,6 +309,9 @@ $(INSTALL_LOGROTDIR)/%: %.logrotate | install_dir_LOGROT
$(INSTALL_APACHE_CONFDIR)/%.conf: %.apache-conf | install_dir_APACHE_CONF $(INSTALL_APACHE_CONFDIR)/%.conf: %.apache-conf | install_dir_APACHE_CONF
$(INSTALL) -o $(APACHE_CONFOWNER) -g $(APACHE_CONFGROUP) -m $(APACHE_CONFMODE) $< $@ $(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_RSYSLOGDIR)/%.conf: %.rsyslog | install_dir_RSYSLOG
$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@ $(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@