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 :)

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

diff --git a/Makefile.win b/Makefile.win
index e5f7cdb9f087324435dd4866c686fb2223025710..77c13fd5a54688ed2526caad596a9de896080714 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -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 @@ _copybin:
        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 @@ _install:
        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 @@ BEGIN {
    }
 }
 <<
-       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 @@ BEGIN {
 
 --------------------------------------------------------------------------------
 <<
-       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 @@ BEGIN {
 
 --------------------------------------------------------------------------------
 <<
+       -copy "$(INSTDIR)\OPENSSL-README.txt" + srclib\openssl\README
 !ENDIF
 !IF EXIST("srclib\zlib")
        type << >> "$(INSTDIR)\NOTICE.txt"
@@ -687,7 +688,7 @@ BEGIN {
                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"