From: William A. Rowe Jr <wrowe@apache.org>
Date: Sat, 29 Dec 2007 03:59:01 +0000 (+0000)
Subject: It turns out copy concat didn't work as I expected,
X-Git-Tag: 2.3.0~1088
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad728242dcae073bcd44090e43d291f5e9baeeb0;p=apache

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

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

diff --git a/Makefile.win b/Makefile.win
index c84dce7d10..6cff62a729 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -608,7 +608,7 @@ BEGIN {
    }
 }
 <<
-	copy <<.tmp "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
+	copy << "$(INSTDIR)\OPENSSL-NEWS.txt" <.y
 
  Apache HTTP Server 2.3 Limited OpenSSL Distribution
 
@@ -624,9 +624,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.3 Limited OpenSSL Distribution
 
@@ -661,8 +661,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"