You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/12/29 04:59:24 UTC
svn commit: r607372 - /httpd/httpd/branches/2.2.x/Makefile.win
Author: wrowe
Date: Fri Dec 28 19:59:24 2007
New Revision: 607372
URL: http://svn.apache.org/viewvc?rev=607372&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.
Backport: r607371
Modified:
httpd/httpd/branches/2.2.x/Makefile.win
Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.win?rev=607372&r1=607371&r2=607372&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Fri Dec 28 19:59:24 2007
@@ -596,7 +596,7 @@
}
}
<<
- 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 @@
--------------------------------------------------------------------------------
<<
- 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 @@
--------------------------------------------------------------------------------
<<
- 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"