apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1412328 - in /apr/apr/trunk: ./ Makefile.in
Date Wed, 21 Nov 2012 22:05:05 GMT
Author: rjung
Date: Wed Nov 21 22:05:04 2012
New Revision: 1412328

URL: http://svn.apache.org/viewvc?rev=1412328&view=rev
Log:
Fix top_builddir in installed apr_rules.mk.

Port of r1101302 from 1.5.x resp.
r1101301 from 1.4.x.

Modified:
    apr/apr/trunk/   (props changed)
    apr/apr/trunk/Makefile.in

Propchange: apr/apr/trunk/
------------------------------------------------------------------------------
  Merged /apr/apr/branches/1.5.x:r1101302
  Merged /apr/apr/branches/1.4.x:r1101301

Modified: apr/apr/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=1412328&r1=1412327&r2=1412328&view=diff
==============================================================================
--- apr/apr/trunk/Makefile.in (original)
+++ apr/apr/trunk/Makefile.in Wed Nov 21 22:05:04 2012
@@ -90,7 +90,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: install-modules $(TARGETS)
 	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \



Mime
View raw message