NetWare build overhaul in order to compile on Linux.

Some more fixes ...

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

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 941962c48e5fd1cd126f56ba935b36b6c0d9c87b..c122b5eb380ab68bd3c8465e20c7b29ca4733eef 100644 (file)
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -64,7 +64,7 @@ endif
 # endif
 
 ifndef METROWERKS
-METROWERKS = C:\Program Files\Metrowerks\CodeWarrior
+METROWERKS = $(ProgramFiles)\Metrowerks\CodeWarrior
 endif
 
 # If LM_LICENSE_FILE isn't defined, define a variable that can be used to

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index fed7964a0a4e7c9f9de385028d6cbcffc74a9773..5ab5e7fb407f37ea5deb1365782f2d91f288c70e 100644 (file)
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -230,7 +230,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM_NAME)_LINKOPT_DEPENDS)
        @echo $(DL)-zerobss$(DL)>> $@
        @echo $(DL)-o $(TARGET_nlm)$(DL)>> $@
 ifneq "$(FILE_nlm_copyright)" ""
-       @-type $(FILE_nlm_copyright)$(DL)>> $@
+       @$(CAT) $(FILE_nlm_copyright)>> $@
 endif
 ifeq "$(RELEASE)" "debug"
        @echo $(DL)-g$(DL)>> $@

diff --git a/modules/NWGNUmakefile b/modules/NWGNUmakefile
index 0778884df176889c14c3f8f26df49a440c3acc8d..fa4da789c29c563fb93be7a66e03e39e5d50944e 100644 (file)
--- a/modules/NWGNUmakefile
+++ b/modules/NWGNUmakefile
@@ -72,7 +72,7 @@ SUBDIRS += test \
 endif
 
 #If the mod_edir directory exists then build the mod_edir module
-ifeq "$(wildcard $(AP_WORK)/modules/mod_edir)" "$(AP_WORK)/modules/mod_edir"
+ifeq "$(wildcard $(STDMOD)/mod_edir)" "$(STDMOD)/mod_edir"
 SUBDIRS += mod_edir \
        $(EOLIST)
 endif

diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index 9693249d50cb1cdb1cbb49bfbe2c95210a5a76c4..5965bfc111f884f22f0c702aa6b42da7bfc4e4d1 100644 (file)
--- 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
-       copy $(OBJDIR)\mod_ssl.nlm $(INSTALL)\$(BASEDIR)\modules\*.*
-       -copy $(subst /,\,$(SSL_BIN))\openssl.nlm $(INSTALL)\$(BASEDIR)\bin\*.*
-       -copy $(subst /,\,$(SSL_APP))\openssl.cnf $(INSTALL)\$(BASEDIR)\bin\*.*
+       $(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/)
 
 #
 # Any specialized rules here