diff options
30 files changed, 103 insertions, 101 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 27fc085f0d..ed67eb71b6 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -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 diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 87a7659f72..0f6ed52362 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -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 diff --git a/build/NWGNUscripts.inc b/build/NWGNUscripts.inc index ecaa7f6ae5..7b0aa0d709 100644 --- a/build/NWGNUscripts.inc +++ b/build/NWGNUscripts.inc @@ -1,8 +1,8 @@ # 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)>> $@
diff --git a/modules/aaa/NWGNUmakefile b/modules/aaa/NWGNUmakefile index 5b9c6be87f..7320af5b50 100644 --- a/modules/aaa/NWGNUmakefile +++ b/modules/aaa/NWGNUmakefile @@ -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 diff --git a/modules/cache/NWGNUmakefile b/modules/cache/NWGNUmakefile index cb2564e87a..bc0c58fe9f 100644 --- a/modules/cache/NWGNUmakefile +++ b/modules/cache/NWGNUmakefile @@ -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 diff --git a/modules/cluster/NWGNUmakefile b/modules/cluster/NWGNUmakefile index 7a396f37e9..eda07b133f 100644 --- a/modules/cluster/NWGNUmakefile +++ b/modules/cluster/NWGNUmakefile @@ -230,7 +230,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 diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile index e4010a5787..7a96c04e83 100644 --- a/modules/database/NWGNUmakefile +++ b/modules/database/NWGNUmakefile @@ -246,7 +246,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 diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile index 15c07df2aa..6bbbad9927 100644 --- a/modules/dav/fs/NWGNUmakefile +++ b/modules/dav/fs/NWGNUmakefile @@ -252,7 +252,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 diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile index 4f7c794e96..0346e060fc 100644 --- a/modules/dav/lock/NWGNUmakefile +++ b/modules/dav/lock/NWGNUmakefile @@ -243,7 +243,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 diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile index 1c14d6d480..01e8438615 100644 --- a/modules/dav/main/NWGNUmakefile +++ b/modules/dav/main/NWGNUmakefile @@ -252,7 +252,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 diff --git a/modules/debugging/NWGNUmakefile b/modules/debugging/NWGNUmakefile index 6050833b7d..e2bfce3539 100644 --- a/modules/debugging/NWGNUmakefile +++ b/modules/debugging/NWGNUmakefile @@ -230,7 +230,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 diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile index d480347f4a..7add53d637 100644 --- a/modules/echo/NWGNUmakefile +++ b/modules/echo/NWGNUmakefile @@ -241,7 +241,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 diff --git a/modules/examples/NWGNUmakefile b/modules/examples/NWGNUmakefile index 382ec2f987..0192576270 100644 --- a/modules/examples/NWGNUmakefile +++ b/modules/examples/NWGNUmakefile @@ -240,7 +240,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 diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile index 1de8cbfa56..29ec122b68 100644 --- a/modules/experimental/NWGNUmakefile +++ b/modules/experimental/NWGNUmakefile @@ -238,7 +238,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 diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate index e463ab39f4..579d1386b8 100644 --- a/modules/filters/NWGNUdeflate +++ b/modules/filters/NWGNUdeflate @@ -260,7 +260,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 diff --git a/modules/filters/NWGNUmakefile b/modules/filters/NWGNUmakefile index a42d32d820..c8b06679fc 100644 --- a/modules/filters/NWGNUmakefile +++ b/modules/filters/NWGNUmakefile @@ -246,7 +246,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 diff --git a/modules/generators/NWGNUmakefile b/modules/generators/NWGNUmakefile index c282d65702..df9cfeca7c 100644 --- a/modules/generators/NWGNUmakefile +++ b/modules/generators/NWGNUmakefile @@ -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 diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile index 9d21f9941b..ef830253f3 100644 --- a/modules/ldap/NWGNUmakefile +++ b/modules/ldap/NWGNUmakefile @@ -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 diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic index 56587d7379..c55f036cee 100644 --- a/modules/loggers/NWGNUforensic +++ b/modules/loggers/NWGNUforensic @@ -242,7 +242,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 diff --git a/modules/loggers/NWGNUmakefile b/modules/loggers/NWGNUmakefile index 1d2e97a177..d7429a0be7 100644 --- a/modules/loggers/NWGNUmakefile +++ b/modules/loggers/NWGNUmakefile @@ -230,7 +230,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 diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio index 186e672778..fa376db73a 100644 --- a/modules/loggers/NWGNUmodlogio +++ b/modules/loggers/NWGNUmodlogio @@ -242,7 +242,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 diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile index c7a4f6e089..6a5202eb81 100644 --- a/modules/lua/NWGNUmakefile +++ b/modules/lua/NWGNUmakefile @@ -254,7 +254,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 diff --git a/modules/mappers/NWGNUmakefile b/modules/mappers/NWGNUmakefile index e4d47a71af..d7abda5539 100644 --- a/modules/mappers/NWGNUmakefile +++ b/modules/mappers/NWGNUmakefile @@ -234,7 +234,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 diff --git a/modules/metadata/NWGNUmakefile b/modules/metadata/NWGNUmakefile index 158cb29fb2..fd93e0eb08 100644 --- a/modules/metadata/NWGNUmakefile +++ b/modules/metadata/NWGNUmakefile @@ -238,7 +238,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 diff --git a/modules/proxy/NWGNUmakefile b/modules/proxy/NWGNUmakefile index 191511f2b2..6d9e32aa24 100644 --- a/modules/proxy/NWGNUmakefile +++ b/modules/proxy/NWGNUmakefile @@ -247,7 +247,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 diff --git a/modules/session/NWGNUmakefile b/modules/session/NWGNUmakefile index e5a83e2788..ff84dd889c 100644 --- a/modules/session/NWGNUmakefile +++ b/modules/session/NWGNUmakefile @@ -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 diff --git a/modules/slotmem/NWGNUmakefile b/modules/slotmem/NWGNUmakefile index 9745c050b6..bdde37d7db 100644 --- a/modules/slotmem/NWGNUmakefile +++ b/modules/slotmem/NWGNUmakefile @@ -230,7 +230,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 diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile index 37e0236154..01c763815f 100644 --- a/modules/ssl/NWGNUmakefile +++ b/modules/ssl/NWGNUmakefile @@ -309,9 +309,9 @@ 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,$(SSL_BIN)/openssl.nlm, $(INSTALL)/$(BASEDIR)/bin/) - $(call COPY,$(SSL_APP)/openssl.cnf, $(INSTALL)/$(BASEDIR)/bin/) + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/modules/) + $(call COPY,$(SSL_BIN)/openssl.nlm, $(INSTALLBASE)/bin/) + $(call COPY,$(SSL_APP)/openssl.cnf, $(INSTALLBASE)/bin/) # # Any specialized rules here diff --git a/modules/test/NWGNUmakefile b/modules/test/NWGNUmakefile index 8521b77e4b..1afb7af971 100644 --- a/modules/test/NWGNUmakefile +++ b/modules/test/NWGNUmakefile @@ -240,7 +240,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 diff --git a/support/NWGNUmakefile b/support/NWGNUmakefile index dce466fd0a..9cb5d1df42 100644 --- a/support/NWGNUmakefile +++ b/support/NWGNUmakefile @@ -35,7 +35,7 @@ nlms :: libs $(TARGET_nlm) # correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples) # install :: nlms FORCE - $(call COPY,$(OBJDIR)/*.nlm, $(INSTALL)/$(BASEDIR)/bin/) + $(call COPY,$(OBJDIR)/*.nlm, $(INSTALLBASE)/bin/) # # Any specialized rules here |