You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/12/22 03:14:16 UTC
svn commit: r606382 - /httpd/httpd/trunk/Makefile.win
Author: wrowe
Date: Fri Dec 21 18:14:14 2007
New Revision: 606382
URL: http://svn.apache.org/viewvc?rev=606382&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 :)
Modified:
httpd/httpd/trunk/Makefile.win
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=606382&r1=606381&r2=606382&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Fri Dec 21 18:14:14 2007
@@ -13,7 +13,7 @@
# The following install defaults may be customized;
#
# Option Default
-# INSTDIR /Apache23
+# INSTDIR /Apache2x
# PORT 80
# SSLPORT 443
# DOMAINNAME example.com
@@ -533,14 +533,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
@@ -589,7 +588,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
@@ -607,7 +606,7 @@
}
}
<<
- copy << + srclib\openssl\NEWS "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
+ copy << "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
Apache HTTP Server 2.3 Limited OpenSSL Distribution
@@ -623,7 +622,8 @@
--------------------------------------------------------------------------------
<<
- 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.3 Limited OpenSSL Distribution
@@ -657,6 +657,7 @@
--------------------------------------------------------------------------------
<<
+ -copy "$(INSTDIR)\OPENSSL-README.txt" + srclib\openssl\README
!ENDIF
!IF EXIST("srclib\zlib")
type << >> "$(INSTDIR)\NOTICE.txt"
@@ -687,7 +688,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"