From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 29 Dec 2007 03:59:24 +0000 (+0000)
Subject: It turns out copy concat didn't work as I expected,
X-Git-Tag: 2.2.7~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3183a04ec36a8cdc3de0c12c057d9a70681161f3;p=thirdparty%2Fapache%2Fhttpd.git

It turns out copy concat didn't work as I expected,
it does concat to the first named file, but not the
first filepath.

Backport: r607371


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@607372 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.win b/Makefile.win
index a44ff133448..986433d5f32 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -596,7 +596,7 @@ BEGIN {
    }
 }
 <<
-	copy <<.tmp "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
+	copy << "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
 
  Apache HTTP Server 2.2 Limited OpenSSL Distribution
 
@@ -613,9 +613,9 @@ BEGIN {
 --------------------------------------------------------------------------------
 
 <<
-	del .tmp
-	-copy "$(INSTDIR)\OPENSSL-NEWS.txt" + srclib\openssl\NEWS
-	copy <<.tmp "$(INSTDIR)\OPENSSL-README.txt" <.y
+	-copy "$(INSTDIR)\OPENSSL-NEWS.txt" \
+	    + srclib\openssl\NEWS "$(INSTDIR)\OPENSSL-NEWS.txt"
+	copy << "$(INSTDIR)\OPENSSL-README.txt" <.y
 
  Apache HTTP Server 2.2 Limited OpenSSL Distribution
 
@@ -649,8 +649,8 @@ BEGIN {
 
 --------------------------------------------------------------------------------
 <<
-	del .tmp
-	-copy "$(INSTDIR)\OPENSSL-README.txt" + srclib\openssl\README
+	-copy "$(INSTDIR)\OPENSSL-README.txt" \
+	    + srclib\openssl\README "$(INSTDIR)\OPENSSL-README.txt"
 !ENDIF
 !IF EXIST("srclib\zlib")
 	type << >> "$(INSTDIR)\NOTICE.txt"