From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-10015-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 23534 invoked by alias); 30 Jan 2009 11:40:43 -0000
Received: (qmail 23528 invoked by alias); 30 Jan 2009 11:40:43 -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: fence: master - build: propagate prefix information into defines.mk
To: cluster-cvs-relay@redhat.com
X-Project: Cluster Project
X-Git-Module: fence.git
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ce2e9ed5ab9aa06c49e8c4a65cdd6d2af9d2565c
X-Git-Newrev: b6317b714fb288d9eca149d0bb6be656545f1075
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Message-Id: <20090130114022.7C52612056C@lists.fedorahosted.org>
Date: Fri, 30 Jan 2009 11:40: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: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2009-q1/txt/msg00336.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/fence.git?p=fence.git;a=commitdiff;h=b6317b714fb288d9eca149d0bb6be656545f1075
Commit:        b6317b714fb288d9eca149d0bb6be656545f1075
Parent:        ce2e9ed5ab9aa06c49e8c4a65cdd6d2af9d2565c
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Fri Jan 30 10:55:57 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Jan 30 12:37:45 2009 +0100

build: propagate prefix information into defines.mk

this will be required to build .pc files

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 configure             |    1 +
 make/defines.mk.input |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 5421c55..1906740 100755
--- a/configure
+++ b/configure
@@ -324,6 +324,7 @@ while (<IFILE>) {
   $_ =~ s/\@COROSYNCLIBDIR\@/$corosynclibdir/;
   $_ =~ s/\@MANDIR\@/$mandir/;
   $_ =~ s/\@SBINDIR\@/$sbindir/;
+  $_ =~ s/\@PREFIX\@/$prefix/;
   $_ =~ s/\@DOCDIR\@/$docdir/;
   $_ =~ s/\@LOGDIR\@/$logdir/;
   $_ =~ s/\@SYSLOGFACILITY\@/$syslogfacility/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 2496288..1eb54fb 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@