You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2013/10/03 12:58:21 UTC

svn commit: r1528805 - in /apr/apr/branches/1.5.x: ./ Makefile.win

Author: rjung
Date: Thu Oct  3 10:58:21 2013
New Revision: 1528805

URL: http://svn.apache.org/r1528805
Log:
Prevent APR/APU from overwriting each other

Forward port of r1003369 from 1.4.x.

Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/Makefile.win

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/branches/1.4.x:r1003369

Modified: apr/apr/branches/1.5.x/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/Makefile.win?rev=1528805&r1=1528804&r2=1528805&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/Makefile.win (original)
+++ apr/apr/branches/1.5.x/Makefile.win Thu Oct  3 10:58:21 2013
@@ -162,9 +162,9 @@ install:
 	@if NOT EXIST "$(PREFIX)\bin\."		mkdir "$(PREFIX)\bin"
 	@if NOT EXIST "$(PREFIX)\include\."	mkdir "$(PREFIX)\include"
 	@if NOT EXIST "$(PREFIX)\lib\."		mkdir "$(PREFIX)\lib"
-	copy CHANGES "$(PREFIX)\CHANGES.txt" <.y
-	copy LICENSE "$(PREFIX)\LICENSE.txt" <.y
-	copy NOTICE  "$(PREFIX)\NOTICE.txt"  <.y
+	copy CHANGES "$(PREFIX)\APR-CHANGES.txt" <.y
+	copy LICENSE "$(PREFIX)\APR-LICENSE.txt" <.y
+	copy NOTICE  "$(PREFIX)\APR-NOTICE.txt"  <.y
 	xcopy include\*.h		"$(PREFIX)\include\" /d < .a
 	copy $(LIBSOSPATH)\apr-1.lib		"$(PREFIX)\lib\" <.y
 	copy $(LIBSOSPATH)\apr-1.pdb		"$(PREFIX)\lib\" <.y