]> granicus.if.org Git - apache/commitdiff
It turns out copy concat didn't work as I expected,
authorWilliam A. Rowe Jr <wrowe@apache.org>
Sat, 29 Dec 2007 03:59:01 +0000 (03:59 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Sat, 29 Dec 2007 03:59:01 +0000 (03:59 +0000)
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

Makefile.win

index c84dce7d10165150c80f2f72a80c1d7819ae7433..6cff62a72951a45d43486ad69c98d08a805c040f 100644 (file)
@@ -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"