Some more NetWare buildsystem tweaks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1083366 13f79535-47bb-0310-9956-ffa450edef68
2025-08-16 16:17:23 +00:00 · 2011-03-20 04:19:49 +00:00
parent 66c61f70d5
commit 8489ec0d04
2 changed files with 96 additions and 93 deletions
--- a/109
+++ b/109
@ -392,68 +392,69 @@ 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,   $(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 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)
+	$(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,          $(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/)
+	$(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,$(STDMOD)/core/mod_watchdog.h,                     $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/cache/mod_cache.h,                       $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/database/mod_dbd.h,                      $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/dav/main/mod_dav.h,                      $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/filters/mod_include.h,                   $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/generators/mod_cgi.h,                    $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/generators/mod_status.h,                 $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/loggers/mod_log_config.h,                $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/mappers/mod_rewrite.h,                   $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/proxy/mod_proxy.h,                       $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/proxy/mod_serf.h,                        $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/session/mod_session.h,                   $(INSTALLBASE)/include/)
+	$(call COPY,$(STDMOD)/ssl/mod_ssl.h,                           $(INSTALLBASE)/include/)
+	$(call COPY,$(APR)/*.imp,                                      $(INSTALLBASE)/lib/)
+	$(call COPY,$(NWOS)/*.imp,                                     $(INSTALLBASE)/lib/)
+	$(call COPY,$(NWOS)/*.xdc,                                     $(INSTALLBASE)/lib/)
+	$(call COPY,$(APBUILD)/NWGNU*.inc,                             $(INSTALLBASE)/build/)

 prebuild :: FORCE
 	$(MAKE) -C $(SERVER) -f NWGNUmakefile
 	$(MAKE) -C $(PCRE) -f NWGNUmakefile
 	$(call MKDIR,$(PREBUILD_INST))
-	$(call COPY,$(SERVER)/$(OBJDIR)/*.nlm,   $(PREBUILD_INST)/)
-	$(call COPY,$(PCRE)/$(OBJDIR)/*.nlm,     $(PREBUILD_INST)/)
+	$(call COPY,$(SERVER)/$(OBJDIR)/*.nlm,                         $(PREBUILD_INST)/)
+	$(call COPY,$(PCRE)/$(OBJDIR)/*.nlm,                           $(PREBUILD_INST)/)

 #
 # Any specialized rules here
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@ -2,9 +2,9 @@
 # Setup needed Tools and Libraries
 #

-ifeq "$(wildcard $(AP_WORK)\NWGNUcustom.ini)" "$(AP_WORK)\NWGNUcustom.ini"
-include $(AP_WORK)\NWGNUcustom.ini
-CUSTOM_INI = $(AP_WORK)\NWGNUcustom.ini
+ifeq "$(wildcard $(AP_WORK)/NWGNUcustom.ini)" "$(AP_WORK)/NWGNUcustom.ini"
+include $(AP_WORK)/NWGNUcustom.ini
+CUSTOM_INI = $(AP_WORK)/NWGNUcustom.ini
 endif

 ifndef VERBOSE
@ -181,15 +181,12 @@ ifndef USE_STDSOCKETS
 INCDIRS	+= $(NOVELLLIBC)/include/winsock;
 endif
 ifneq "$(LDAPSDK)" ""
-#INCDIRS := $(INCDIRS);$(LDAPSDK)/inc
 INCDIRS += $(LDAPSDK)/inc;
 endif
 ifneq "$(ZLIBSDK)" ""
-#INCDIRS := $(INCDIRS);$(ZLIBSDK)
 INCDIRS += $(ZLIBSDK);
 endif
 ifneq "$(PCRESRC)" ""
-#INCDIRS := $(INCDIRS);$(PCRESRC)
 INCDIRS += $(PCRESRC);
 endif

@ -269,30 +266,6 @@ endif
 # Declare major project deliverables output directories here
 #

-ifdef DEST
-INSTALL = $(DEST)
-ifeq (\, $(findstring \,$(INSTALL)))
-INSTDIRS = $(DEST)
-endif
-endif
-
-ifdef dest
-INSTALL = $(dest)
-ifeq (\, $(findstring \,$(INSTALL)))
-INSTDIRS = $(dest)
-endif
-endif
-
-ifndef INSTALL
-INSTALL = $(AP_WORK)/Dist
-INSTDIRS = $(AP_WORK)/Dist
-endif
-
-ifndef BASEDIR
-BASEDIR = Apache23
-export BASEDIR
-endif
-
 ifndef PORT
 PORT = 80
 endif
@ -301,10 +274,34 @@ ifndef SSLPORT
 SSLPORT = 443
 endif

+ifdef DEST
+INSTALL = $(subst \,/,$(DEST))
+ifeq (/, $(findstring /,$(INSTALL)))
+INSTDIRS = $(INSTALL)
+endif
+endif
+
+ifdef dest
+INSTALL = $(subst \,/,$(dest))
+ifeq (/, $(findstring /,$(INSTALL)))
+INSTDIRS = $(INSTALL)
+endif
+endif
+
+ifndef INSTALL
+INSTALL = $(AP_WORK)/Dist
+INSTDIRS = $(INSTALL)
+endif
+
+ifndef BASEDIR
+BASEDIR = Apache23
+export BASEDIR
+endif
+
 # Add support for building IPV6 alongside
 ifneq "$(IPV6)" ""
 DEFINES += -DNW_BUILD_IPV6
-# INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS)
+# INCDIRS := $(NOVELLLIBC)/include/winsock/IPV6;$(INCDIRS)

 ifneq "$(findstring IPV6,$(OBJDIR))" "IPV6"
 OBJDIR := $(OBJDIR)_IPV6
@ -323,12 +320,15 @@ endif
 INSTALLBASE := $(INSTALL)/$(BASEDIR)

 INSTDEVDIRS := \
-	$(INSTDIRS) \
+	$(INSTALL) \
+	$(INSTALLBASE) \
+	$(INSTALLBASE)/build \
 	$(INSTALLBASE)/include \
 	$(INSTALLBASE)/lib \
+	$(EOLIST) 

 INSTDIRS += \
-	$(INSTALL)/$(BASEDIR) \
+	$(INSTALLBASE) \
 	$(INSTALLBASE)/bin \
 	$(INSTALLBASE)/cgi-bin \
 	$(INSTALLBASE)/conf \
@ -340,25 +340,27 @@ INSTDIRS += \
 	$(INSTALLBASE)/man \
 	$(INSTALLBASE)/manual \
 	$(INSTALLBASE)/modules \
+	$(EOLIST) 

 #
 # Common directories
 #

 SRC		= $(subst \,/,$(AP_WORK))
+APR		= $(subst \,/,$(APR_WORK))
+APRUTIL		= $(subst \,/,$(APU_WORK))
 APBUILD		= $(SRC)/build
 STDMOD		= $(SRC)/modules
 HTTPD		= $(SRC)/modules/http
 NWOS		= $(SRC)/os/netware
 SERVER		= $(SRC)/server
 SUPMOD		= $(SRC)/support
-APR		= $(APR_WORK)
-APRUTIL		= $(APU_WORK)
-APULDAP		= $(APU_WORK)/ldap
-XML		= $(APU_WORK)/xml
-APRTEST		= $(APR_WORK)/test
+APULDAP		= $(APRUTIL)/ldap
+XML		= $(APRUTIL)/xml
+APRTEST		= $(APR)/test
 PCRE		= $(PCRESRC)
-PREBUILD_INST   = $(SRC)/nwprebuild
+
+PREBUILD_INST	= $(SRC)/nwprebuild

 #
 # Internal Libraries