From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2214 invoked by alias); 30 Jan 2009 11:08:18 -0000 Received: (qmail 2208 invoked by alias); 30 Jan 2009 11:08:18 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - build: propagate prefix information into defines.mk To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 8b6b7898c8a759dfe7390a6c276e41be5811cbfd X-Git-Newrev: 71d82047f1553a45a572429e2374db405808330d From: "Fabio M. Di Nitto" Message-Id: <20090130110727.73B41C024D@lists.fedorahosted.org> Date: Fri, 30 Jan 2009 11:08:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00322.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=71d82047f1553a45a572429e2374db405808330d Commit: 71d82047f1553a45a572429e2374db405808330d Parent: 8b6b7898c8a759dfe7390a6c276e41be5811cbfd Author: Fabio M. Di Nitto AuthorDate: Fri Jan 30 10:55:57 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Jan 30 10:55:57 2009 +0100 build: propagate prefix information into defines.mk this will be required to build .pc files Signed-off-by: Fabio M. Di Nitto --- configure | 1 + make/defines.mk.input | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a4fbfd7..7af2667 100755 --- a/configure +++ b/configure @@ -783,6 +783,7 @@ while () { $_ =~ s/\@LIBEXECDIR\@/$libexecdir/; $_ =~ s/\@MANDIR\@/$mandir/; $_ =~ s/\@SBINDIR\@/$sbindir/; + $_ =~ s/\@PREFIX\@/$prefix/; $_ =~ s/\@INITDDIR\@/$initddir/; $_ =~ s/\@SHAREDIR\@/$sharedir/; $_ =~ s/\@DOCDIR\@/$docdir/; diff --git a/make/defines.mk.input b/make/defines.mk.input index 34c7300..e6edebb 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -1,4 +1,5 @@ # Install Locations +prefix ?= ${DESTDIR}@PREFIX@ sbindir ?= ${DESTDIR}@SBINDIR@ initddir ?= ${DESTDIR}@INITDDIR@ libdir ?= ${DESTDIR}@LIBDIR@