Commit 5500fbbb authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Use a var INSTALLBASE to simplify NetWare installation rules. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082821 13f79535-47bb-0310-9956-ffa450edef68
parent 576c6a5c

NWGNUmakefile

+53 −53
Changes for NWGNUmakefile: 53 added lines, 53 removed lines.
Original line number Diff line number Diff line
@@ -392,61 +392,61 @@ nlms :: libs $(TARGET_nlm) 
MKCNF	= $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2



install :: nlms instscripts FORCE

	$(call COPY,$(OBJDIR)/$(NLM_NAME).nlm,   $(INSTALL)/$(BASEDIR)/)

	$(call COPY,ABOUT_APACHE,                $(INSTALL)/$(BASEDIR)/)

	$(call COPY,CHANGES,                     $(INSTALL)/$(BASEDIR)/)

	$(call COPY,LICENSE,                     $(INSTALL)/$(BASEDIR)/)

	$(call COPY,README,                      $(INSTALL)/$(BASEDIR)/)

	$(call COPY,VERSIONING,                  $(INSTALL)/$(BASEDIR)/)

	$(call COPY,STATUS,                      $(INSTALL)/$(BASEDIR)/)

	$(call COPY,support/dbmmanage.in,        $(INSTALL)/$(BASEDIR)/bin/dbmmanage.pl)

	$(call COPY,support/logresolve.pl.in,    $(INSTALL)/$(BASEDIR)/bin/logresolve.pl)

	$(call COPY,support/split-logfile.in,    $(INSTALL)/$(BASEDIR)/bin/split-logfile.pl)

	$(call COPY,support/check_forensic,      $(INSTALL)/$(BASEDIR)/bin/check_forensic.sh)

	$(call COPY,docs/conf/magic,             $(INSTALL)/$(BASEDIR)/conf/)

	$(call COPY,docs/conf/mime.types,        $(INSTALL)/$(BASEDIR)/conf/)

	$(call COPY,docs/conf/charset.conv,      $(INSTALL)/$(BASEDIR)/conf/)

	$(call COPY,docs/cgi-examples/printenv,  $(INSTALL)/$(BASEDIR)/cgi-bin/printenv.pl)

	$(call MKCNF,docs/conf/httpd.conf.in,    $(INSTALL)/$(BASEDIR)/conf/httpd.conf)

	$(call MKCNF,docs/conf/extra/httpd-autoindex.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-autoindex.conf)

	$(call MKCNF,docs/conf/extra/httpd-dav.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-dav.conf)

	$(call MKCNF,docs/conf/extra/httpd-default.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-default.conf)

	$(call MKCNF,docs/conf/extra/httpd-info.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-info.conf)

	$(call MKCNF,docs/conf/extra/httpd-languages.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-languages.conf)

	$(call MKCNF,docs/conf/extra/httpd-manual.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-manual.conf)

	$(call MKCNF,docs/conf/extra/httpd-mpm.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-mpm.conf)

	$(call MKCNF,docs/conf/extra/httpd-multilang-errordoc.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-multilang-errordoc.conf)

	$(call MKCNF,docs/conf/extra/httpd-userdir.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-userdir.conf)

	$(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-vhosts.conf)

	$(call MKCNF,docs/conf/extra/httpd-ssl.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-ssl.conf)

	$(call COPYR,docs/docroot,               $(INSTALL)/$(BASEDIR)/htdocs)

	$(call COPYR,docs/error,                 $(INSTALL)/$(BASEDIR)/error)

	$(call COPYR,docs/icons,                 $(INSTALL)/$(BASEDIR)/icons)

	$(call COPYR,docs/man,                   $(INSTALL)/$(BASEDIR)/man)

	$(call COPYR,docs/manual,                $(INSTALL)/$(BASEDIR)/manual)

	$(call COPY,$(OBJDIR)/$(NLM_NAME).nlm,   $(INSTALLBASE)/)

	$(call COPY,ABOUT_APACHE,                $(INSTALLBASE)/)

	$(call COPY,CHANGES,                     $(INSTALLBASE)/)

	$(call COPY,LICENSE,                     $(INSTALLBASE)/)

	$(call COPY,README,                      $(INSTALLBASE)/)

	$(call COPY,VERSIONING,                  $(INSTALLBASE)/)

	$(call COPY,STATUS,                      $(INSTALLBASE)/)

	$(call COPY,support/dbmmanage.in,        $(INSTALLBASE)/bin/dbmmanage.pl)

	$(call COPY,support/logresolve.pl.in,    $(INSTALLBASE)/bin/logresolve.pl)

	$(call COPY,support/split-logfile.in,    $(INSTALLBASE)/bin/split-logfile.pl)

	$(call COPY,support/check_forensic,      $(INSTALLBASE)/bin/check_forensic.sh)

	$(call COPY,docs/conf/magic,             $(INSTALLBASE)/conf/)

	$(call COPY,docs/conf/mime.types,        $(INSTALLBASE)/conf/)

	$(call COPY,docs/conf/charset.conv,      $(INSTALLBASE)/conf/)

	$(call COPY,docs/cgi-examples/printenv,  $(INSTALLBASE)/cgi-bin/printenv.pl)

	$(call MKCNF,docs/conf/httpd.conf.in,    $(INSTALLBASE)/conf/httpd.conf)

	$(call MKCNF,docs/conf/extra/httpd-autoindex.conf.in, $(INSTALLBASE)/conf/extra/httpd-autoindex.conf)

	$(call MKCNF,docs/conf/extra/httpd-dav.conf.in, $(INSTALLBASE)/conf/extra/httpd-dav.conf)

	$(call MKCNF,docs/conf/extra/httpd-default.conf.in, $(INSTALLBASE)/conf/extra/httpd-default.conf)

	$(call MKCNF,docs/conf/extra/httpd-info.conf.in, $(INSTALLBASE)/conf/extra/httpd-info.conf)

	$(call MKCNF,docs/conf/extra/httpd-languages.conf.in, $(INSTALLBASE)/conf/extra/httpd-languages.conf)

	$(call MKCNF,docs/conf/extra/httpd-manual.conf.in, $(INSTALLBASE)/conf/extra/httpd-manual.conf)

	$(call MKCNF,docs/conf/extra/httpd-mpm.conf.in, $(INSTALLBASE)/conf/extra/httpd-mpm.conf)

	$(call MKCNF,docs/conf/extra/httpd-multilang-errordoc.conf.in, $(INSTALLBASE)/conf/extra/httpd-multilang-errordoc.conf)

	$(call MKCNF,docs/conf/extra/httpd-userdir.conf.in, $(INSTALLBASE)/conf/extra/httpd-userdir.conf)

	$(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in, $(INSTALLBASE)/conf/extra/httpd-vhosts.conf)

	$(call MKCNF,docs/conf/extra/httpd-ssl.conf.in, $(INSTALLBASE)/conf/extra/httpd-ssl.conf)

	$(call COPYR,docs/docroot,               $(INSTALLBASE)/htdocs)

	$(call COPYR,docs/error,                 $(INSTALLBASE)/error)

	$(call COPYR,docs/icons,                 $(INSTALLBASE)/icons)

	$(call COPYR,docs/man,                   $(INSTALLBASE)/man)

	$(call COPYR,docs/manual,                $(INSTALLBASE)/manual)



installdev :: FORCE

	$(call COPY,$(SRC)/include/*.h,          $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,$(NWOS)/*.h,                 $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,$(APR)/include/*.h,          $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,$(APRUTIL)/include/*.h,      $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,$(STDMOD)/core/mod_so.h,     $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,core/mod_watchdog.h,         $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,cache/mod_cache.h,           $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,database/mod_dbd.h,          $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,dav/main/mod_dav.h,          $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,filters/mod_include.h,       $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,generators/mod_cgi.h,        $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,generators/mod_status.h,     $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,loggers/mod_log_config.h,    $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,mappers/mod_rewrite.h,       $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,proxy/mod_proxy.h,           $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,proxy/mod_serf.h,            $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,session/mod_session.h,       $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,ssl/mod_ssl.h,               $(INSTALL)/$(BASEDIR)/include/)

	$(call COPY,$(APR)/*.imp,                $(INSTALL)/$(BASEDIR)/lib/)

	$(call COPY,$(NWOS)/*.imp,               $(INSTALL)/$(BASEDIR)/lib/)

	$(call COPY,$(NWOS)/*.xdc,               $(INSTALL)/$(BASEDIR)/lib/)

	$(call COPY,$(SRC)/include/*.h,          $(INSTALLBASE)/include/)

	$(call COPY,$(NWOS)/*.h,                 $(INSTALLBASE)/include/)

	$(call COPY,$(APR)/include/*.h,          $(INSTALLBASE)/include/)

	$(call COPY,$(APRUTIL)/include/*.h,      $(INSTALLBASE)/include/)

	$(call COPY,$(STDMOD)/core/mod_so.h,     $(INSTALLBASE)/include/)

	$(call COPY,core/mod_watchdog.h,         $(INSTALLBASE)/include/)

	$(call COPY,cache/mod_cache.h,           $(INSTALLBASE)/include/)

	$(call COPY,database/mod_dbd.h,          $(INSTALLBASE)/include/)

	$(call COPY,dav/main/mod_dav.h,          $(INSTALLBASE)/include/)

	$(call COPY,filters/mod_include.h,       $(INSTALLBASE)/include/)

	$(call COPY,generators/mod_cgi.h,        $(INSTALLBASE)/include/)

	$(call COPY,generators/mod_status.h,     $(INSTALLBASE)/include/)

	$(call COPY,loggers/mod_log_config.h,    $(INSTALLBASE)/include/)

	$(call COPY,mappers/mod_rewrite.h,       $(INSTALLBASE)/include/)

	$(call COPY,proxy/mod_proxy.h,           $(INSTALLBASE)/include/)

	$(call COPY,proxy/mod_serf.h,            $(INSTALLBASE)/include/)

	$(call COPY,session/mod_session.h,       $(INSTALLBASE)/include/)

	$(call COPY,ssl/mod_ssl.h,               $(INSTALLBASE)/include/)

	$(call COPY,$(APR)/*.imp,                $(INSTALLBASE)/lib/)

	$(call COPY,$(NWOS)/*.imp,               $(INSTALLBASE)/lib/)

	$(call COPY,$(NWOS)/*.xdc,               $(INSTALLBASE)/lib/)



prebuild :: FORCE

	$(MAKE) -C $(SERVER) -f NWGNUmakefile

build/NWGNUenvironment.inc

+15 −13
Changes for build/NWGNUenvironment.inc: 15 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -320,24 +320,26 @@ endif 


endif



INSTALLBASE := $(INSTALL)/$(BASEDIR)



INSTDEVDIRS := \

	$(INSTDIRS) \

	$(INSTALL)/$(BASEDIR)/include \

	$(INSTALL)/$(BASEDIR)/lib \

	$(INSTALLBASE)/include \

	$(INSTALLBASE)/lib \



INSTDIRS += \

	$(INSTALL)/$(BASEDIR) \

	$(INSTALL)/$(BASEDIR)/bin \

	$(INSTALL)/$(BASEDIR)/cgi-bin \

	$(INSTALL)/$(BASEDIR)/conf \

	$(INSTALL)/$(BASEDIR)/conf/extra \

	$(INSTALL)/$(BASEDIR)/error \

	$(INSTALL)/$(BASEDIR)/htdocs \

	$(INSTALL)/$(BASEDIR)/icons \

	$(INSTALL)/$(BASEDIR)/logs \

	$(INSTALL)/$(BASEDIR)/man \

	$(INSTALL)/$(BASEDIR)/manual \

	$(INSTALL)/$(BASEDIR)/modules \

	$(INSTALLBASE)/bin \

	$(INSTALLBASE)/cgi-bin \

	$(INSTALLBASE)/conf \

	$(INSTALLBASE)/conf/extra \

	$(INSTALLBASE)/error \

	$(INSTALLBASE)/htdocs \

	$(INSTALLBASE)/icons \

	$(INSTALLBASE)/logs \

	$(INSTALLBASE)/man \

	$(INSTALLBASE)/manual \

	$(INSTALLBASE)/modules \



#

# Common directories

build/NWGNUscripts.inc

+6 −6
Changes for build/NWGNUscripts.inc: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line 
# Include for creating start/stop/restart NCF scripts.



instscripts:: FORCE $(INSTALL)/$(BASEDIR)/ap2start.ncf $(INSTALL)/$(BASEDIR)/ap2auto.ncf $(INSTALL)/$(BASEDIR)/ap2rest.ncf $(INSTALL)/$(BASEDIR)/ap2stop.ncf

instscripts:: FORCE $(INSTALLBASE)/ap2start.ncf $(INSTALLBASE)/ap2auto.ncf $(INSTALLBASE)/ap2rest.ncf $(INSTALLBASE)/ap2stop.ncf



$(INSTALL)/$(BASEDIR)/ap2start.ncf:

$(INSTALLBASE)/ap2start.ncf:

	@echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@

	@echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@

	@echo $(DL)# httpcloseport 80 /silent$(DL)>> $@
@@ -12,7 +12,7 @@ $(INSTALL)/$(BASEDIR)/ap2start.ncf: 
	@echo $(DL)# load SYS:/$(BASEDIR)/apache2$(DL)>> $@

	@$(ECHONL)>> $@



$(INSTALL)/$(BASEDIR)/ap2auto.ncf:

$(INSTALLBASE)/ap2auto.ncf:

	@echo $(DL)# NCF to start Apache 2.x in own address space$(DL)> $@

	@echo $(DL)# and let automatically restart in case it crashes$(DL)>> $@

	@echo $(DL)# Make sure that httpstk is not listening on 80$(DL)>> $@
@@ -21,21 +21,21 @@ $(INSTALL)/$(BASEDIR)/ap2auto.ncf: 
	@echo $(DL)restart address space = $(BASEDIR) SYS:/$(BASEDIR)/apache2$(DL)>> $@

	@$(ECHONL)>> $@



$(INSTALL)/$(BASEDIR)/ap2rest.ncf:

$(INSTALLBASE)/ap2rest.ncf:

	@echo $(DL)# NCF to restart Apache 2.x in own address space$(DL)> $@

	@echo $(DL)apache2 restart -p $(BASEDIR)$(DL)>> $@

	@echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@

	@echo $(DL)# apache2 restart$(DL)>> $@

	@$(ECHONL)>> $@



$(INSTALL)/$(BASEDIR)/ap2stop.ncf:

$(INSTALLBASE)/ap2stop.ncf:

	@echo $(DL)# NCF to stop Apache 2.x in own address space$(DL)> $@

	@echo $(DL)apache2 shutdown -p $(BASEDIR)$(DL)>> $@

	@echo $(DL)# If you have loaded Apache2.x in OS space use the line below.$(DL)>> $@

	@echo $(DL)# apache2 shutdown$(DL)>> $@

	@$(ECHONL)>> $@



$(INSTALL)/$(BASEDIR)/ap2prod.ncf:

$(INSTALLBASE)/ap2prod.ncf:

	@echo $(DL)# NCF to create a product record for Apache 2.x in product database$(DL)> $@

	@echo $(DL)PRODSYNC DEL APACHE$(VERSION_MAJMIN)$(DL)>> $@

	@echo $(DL)PRODSYNC ADD APACHE$(VERSION_MAJMIN) ProductRecord "$(VERSION_STR)" "Apache $(VERSION_STR) Webserver"$(DL)>> $@

modules/aaa/NWGNUmakefile

+1 −1
Changes for modules/aaa/NWGNUmakefile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ nlms :: libs $(TARGET_nlm) 
# correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)

#

install :: nlms FORCE

	$(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)

	$(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)



#

# Any specialized rules here

modules/cache/NWGNUmakefile

+1 −1
Changes for modules/cache/NWGNUmakefile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ nlms :: libs $(TARGET_nlm) 
# correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)

#

install :: nlms FORCE

	$(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/modules/)

	$(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/)



#

# Any specialized rules here