httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1079902 - in /httpd/httpd/trunk: build/NWGNUenvironment.inc build/NWGNUtail.inc modules/NWGNUmakefile modules/ssl/NWGNUmakefile
Date Wed, 09 Mar 2011 17:26:27 GMT
Author: fuankg
Date: Wed Mar  9 17:26:27 2011
New Revision: 1079902

URL: http://svn.apache.org/viewvc?rev=1079902&view=rev
Log:
NetWare build overhaul in order to compile on Linux.

Some more fixes ...

Modified:
    httpd/httpd/trunk/build/NWGNUenvironment.inc
    httpd/httpd/trunk/build/NWGNUtail.inc
    httpd/httpd/trunk/modules/NWGNUmakefile
    httpd/httpd/trunk/modules/ssl/NWGNUmakefile

Modified: httpd/httpd/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUenvironment.inc?rev=1079902&r1=1079901&r2=1079902&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/trunk/build/NWGNUenvironment.inc Wed Mar  9 17:26:27 2011
@@ -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

Modified: httpd/httpd/trunk/build/NWGNUtail.inc
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/NWGNUtail.inc?rev=1079902&r1=1079901&r2=1079902&view=diff
==============================================================================
--- httpd/httpd/trunk/build/NWGNUtail.inc (original)
+++ httpd/httpd/trunk/build/NWGNUtail.inc Wed Mar  9 17:26:27 2011
@@ -230,7 +230,7 @@ $(OBJDIR)/$(NLM_NAME)_link.opt : $($(NLM
 	@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)>> $@

Modified: httpd/httpd/trunk/modules/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/NWGNUmakefile?rev=1079902&r1=1079901&r2=1079902&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/NWGNUmakefile Wed Mar  9 17:26:27 2011
@@ -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

Modified: httpd/httpd/trunk/modules/ssl/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/NWGNUmakefile?rev=1079902&r1=1079901&r2=1079902&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/NWGNUmakefile (original)
+++ httpd/httpd/trunk/modules/ssl/NWGNUmakefile Wed Mar  9 17:26:27 2011
@@ -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



Mime
View raw message