apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1412330 - in /apr/apr/branches/1.3.x: ./ CHANGES Makefile.in
Date Wed, 21 Nov 2012 22:11:51 GMT
Author: rjung
Date: Wed Nov 21 22:11:50 2012
New Revision: 1412330

URL: http://svn.apache.org/viewvc?rev=1412330&view=rev
Log:
Backport some Makefile changes from trunk,
1.5.x, 1.4.x.

Fix extraclean make target:
also remove libtool2 files.

Trunk: r1125522
1.5.x: r1125523
1.4.x: r1125524

Fix top_builddir in installed apr_rules.mk.

Trunk: r1412328
1.5.x: r1101302
1.4.x: r1101301

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

Propchange: apr/apr/branches/1.3.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1125522,1412328

Modified: apr/apr/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?rev=1412330&r1=1412329&r2=1412330&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.3.x/CHANGES [utf-8] Wed Nov 21 22:11:50 2012
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes for APR 1.3.13
 
+  *) Add libtool2 files to extraclean make target.  [Rainer Jung]
+
+  *) Fix top_builddir in installed apr_rules.mk.  [Bojan Smojver]
+
   *) Improve platform detection by updating config.guess and config.sub.
      [Rainer Jung]
 

Modified: apr/apr/branches/1.3.x/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/Makefile.in?rev=1412330&r1=1412329&r2=1412330&view=diff
==============================================================================
--- apr/apr/branches/1.3.x/Makefile.in (original)
+++ apr/apr/branches/1.3.x/Makefile.in Wed Nov 21 22:11:50 2012
@@ -51,7 +51,10 @@ DISTCLEAN_TARGETS = config.cache config.
 	libtool $(APR_CONFIG) build/apr_rules.mk apr.pc \
 	build/pkg/pkginfo
 EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in \
-	build-outputs.mk build/ltcf-c.sh build/ltmain.sh build/libtool.m4
+	build-outputs.mk build/ltcf-c.sh build/aclocal.m4 \
+	build/ltconfig build/ltmain.sh \
+	build/argz.m4 build/libtool.m4 build/ltoptions.m4 \
+	build/ltsugar.m4 build/ltversion.m4 build/lt~obsolete.m4
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -66,7 +69,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) \



Mime
View raw message