diff options
| author | Guenter Knauf <fuankg@apache.org> | 2011-03-09 17:26:27 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2011-03-09 17:26:27 +0000 |
| commit | 64ab64f008bdfe4fc8bdc4e89790b94eb4d5708b (patch) | |
| tree | 24775522e908eda247b807966944b00a4f67b431 | |
| parent | 10ad24bb7e6b9bd86d8cde50061698f33365d2f0 (diff) | |
| download | httpd-64ab64f008bdfe4fc8bdc4e89790b94eb4d5708b.tar.gz | |
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
| -rw-r--r-- | build/NWGNUenvironment.inc | 2 | ||||
| -rw-r--r-- | build/NWGNUtail.inc | 2 | ||||
| -rw-r--r-- | modules/NWGNUmakefile | 2 | ||||
| -rw-r--r-- | modules/ssl/NWGNUmakefile | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 941962c48e..c122b5eb38 100644 --- 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 fed7964a0a..5ab5e7fb40 100644 --- 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 0778884df1..fa4da789c2 100644 --- 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 9693249d50..5965bfc111 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 - 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 |