httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r607371 - /httpd/httpd/trunk/Makefile.win
Date Sat, 29 Dec 2007 03:59:02 GMT
Author: wrowe
Date: Fri Dec 28 19:59:01 2007
New Revision: 607371

URL: http://svn.apache.org/viewvc?rev=607371&view=rev
Log:
It turns out copy concat didn't work as I expected,
it does concat to the first named file, but not the
first filepath.

Modified:
    httpd/httpd/trunk/Makefile.win

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=607371&r1=607370&r2=607371&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Fri Dec 28 19:59:01 2007
@@ -608,7 +608,7 @@
    }
 }
 <<
-	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 @@
 
 --------------------------------------------------------------------------------
 <<
-	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 @@
 --------------------------------------------------------------------------------
 
 <<
-	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"



Mime
View raw message