Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 08B69D844 for ; Wed, 21 Nov 2012 22:05:29 +0000 (UTC) Received: (qmail 17590 invoked by uid 500); 21 Nov 2012 22:05:28 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 17550 invoked by uid 500); 21 Nov 2012 22:05:28 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 17543 invoked by uid 99); 21 Nov 2012 22:05:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Nov 2012 22:05:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Nov 2012 22:05:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BF5C323888CD for ; Wed, 21 Nov 2012 22:05:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1412328 - in /apr/apr/trunk: ./ Makefile.in Date: Wed, 21 Nov 2012 22:05:05 -0000 To: commits@apr.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121121220505.BF5C323888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) \