httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r606384 - /httpd/httpd/branches/2.2.x/Makefile.win
Date Sat, 22 Dec 2007 02:19:06 GMT
Author: wrowe
Date: Fri Dec 21 18:19:05 2007
New Revision: 606384

URL: http://svn.apache.org/viewvc?rev=606384&view=rev
Log:
Solve two ssl issues; always install both ab.exe and abs.exe
because it's easier to move around ab.exe when that's all
someone needs (and this is precisely how the binary installer
works, too), and also kindly ignore missing openssl tree files
because TIMTOWTDI (although this one is preferred :)

Backport: r606382, r606383

Modified:
    httpd/httpd/branches/2.2.x/Makefile.win

Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.win?rev=606384&r1=606383&r2=606384&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Fri Dec 21 18:19:05 2007
@@ -524,14 +524,13 @@
 	copy modules\proxy\$(LONG)\mod_proxy_ftp.$(src_so) 	"$(inst_so)" <.y
 	copy modules\proxy\$(LONG)\mod_proxy_http.$(src_so) 	"$(inst_so)" <.y
 !IF EXIST("srclib\openssl")
-	copy modules\ssl\$(LONG)\mod_ssl.$(src_so) 			"$(inst_so)" <.y
-	$(quiet)copy srclib\openssl\$(SSLBIN)\openssl.$(src_exe) 	"$(inst_exe)" <.y
-	$(quiet)copy srclib\openssl\$(SSLBIN)\libeay32.$(src_dll) 	"$(inst_dll)" <.y
-	$(quiet)copy srclib\openssl\$(SSLBIN)\ssleay32.$(src_dll) 	"$(inst_dll)" <.y
-	copy support\$(LONG)\abs.$(src_exe) 	"$(inst_exe)\ab.$(src_exe)" <.y
-!ELSE
-	copy support\$(LONG)\ab.$(src_exe) 				"$(inst_exe)" <.y
+	copy modules\ssl\$(LONG)\mod_ssl.$(src_so) 		"$(inst_so)" <.y
+	-copy srclib\openssl\$(SSLBIN)\libeay32.$(src_dll) 	"$(inst_dll)" <.y
+	-copy srclib\openssl\$(SSLBIN)\ssleay32.$(src_dll) 	"$(inst_dll)" <.y
+	-copy srclib\openssl\$(SSLBIN)\openssl.$(src_exe) 	"$(inst_exe)" <.y
+	copy support\$(LONG)\abs.$(src_exe) 			"$(inst_exe)" <.y
 !ENDIF
+	copy support\$(LONG)\ab.$(src_exe) 			"$(inst_exe)" <.y
 	copy support\$(LONG)\htcacheclean.$(src_exe)		"$(inst_exe)" <.y
 	copy support\$(LONG)\htdbm.$(src_exe) 			"$(inst_exe)" <.y
 	copy support\$(LONG)\htdigest.$(src_exe) 		"$(inst_exe)" <.y
@@ -579,7 +578,7 @@
 	copy NOTICE       "$(INSTDIR)\NOTICE.txt" <.y
 	copy README       "$(INSTDIR)\README.txt" <.y
 !IF EXIST("srclib\openssl")
-	copy srclib\openssl\apps\openssl.cnf "$(INSTDIR)\conf\openssl.cnf" <.y
+	-copy srclib\openssl\apps\openssl.cnf "$(INSTDIR)\conf\openssl.cnf" <.y
 	type << >> "$(INSTDIR)\NOTICE.txt"
 
   This binary distribution includes cryptographic software written by
@@ -597,7 +596,7 @@
    }
 }
 <<
-	copy << + srclib\openssl\NEWS "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
+	copy << "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
 
  Apache HTTP Server 2.2 Limited OpenSSL Distribution
 
@@ -612,8 +611,10 @@
  support for the patented encryption methods IDEA, MDC-2 or RC5.
 
 --------------------------------------------------------------------------------
+
 <<
-	copy << + srclib\openssl\README "$(INSTDIR)\OPENSSL-README.txt" <.y
+	-copy "$(INSTDIR)\OPENSSL-NEWS.txt" + srclib\openssl\NEWS
+	copy << "$(INSTDIR)\OPENSSL-README.txt" <.y
 
  Apache HTTP Server 2.2 Limited OpenSSL Distribution
 
@@ -647,6 +648,7 @@
 
 --------------------------------------------------------------------------------
 <<
+	-copy "$(INSTDIR)\OPENSSL-README.txt" + srclib\openssl\README
 !ENDIF
 !IF EXIST("srclib\zlib")
 	type << >> "$(INSTDIR)\NOTICE.txt"
@@ -677,7 +679,7 @@
 		inst_dll="$(INSTDIR)\bin"                              \
 		inst_so="$(INSTDIR)\modules"
 	$(MAKE) $(MAKEOPT) -f Makefile.win SHORT=$(SHORT) LONG=$(LONG) \
-		_copybin src_exe=pdb src_dll=pdb src_so=pdb quiet="-"  \
+		_copybin src_exe=pdb src_dll=pdb src_so=pdb            \
 		inst_exe="$(INSTDIR)\bin"                              \
 		inst_dll="$(INSTDIR)\bin"                              \
 		inst_so="$(INSTDIR)\modules"



Mime
View raw message