You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@apr.apache.org by bo...@apache.org on 2011/05/10 05:48:45 UTC

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

Author: bojan
Date: Tue May 10 03:48:45 2011
New Revision: 1101302

URL: http://svn.apache.org/viewvc?rev=1101302&view=rev
Log:
Merge r1101301 from 1.4.x branch.
Fix top_builddir in installed apr_rules.mk.

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

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 10 03:48:45 2011
@@ -1 +1,2 @@
+/apr/apr/branches/1.4.x:1101301
 /apr/apr/trunk:733052,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,908427,910419,917819,917837-917838,983618,990435,1055657,1072165,1078845

Modified: apr/apr/branches/1.5.x/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/Makefile.in?rev=1101302&r1=1101301&r2=1101302&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/Makefile.in (original)
+++ apr/apr/branches/1.5.x/Makefile.in Tue May 10 03:48:45 2011
@@ -66,7 +66,7 @@ apr-config.out: $(APR_CONFIG)
 
 # Create apr_rules.mk suitable for the install tree
 build/apr_rules.out: build/apr_rules.mk
-	sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
+	sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@
 
 install: $(TARGETS)
 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \