From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-10864-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 5202 invoked by alias); 4 May 2009 10:05:42 -0000
Received: (qmail 5180 invoked by alias); 4 May 2009 10:05:41 -0000
X-SWARE-Spam-Status: No, hits=-1.9 required=5.0
	tests=AWL,BAYES_00,SPF_HELO_PASS
X-Spam-Status: No, hits=-1.9 required=5.0
	tests=AWL,BAYES_00,SPF_HELO_PASS
X-Spam-Check-By: sourceware.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	bastion2.fedora.phx.redhat.com
Subject: cluster: master - build: propagate relative info about /sbin vs
	sbindir
To: cluster-cvs-relay@redhat.com
X-Project: Cluster Project
X-Git-Module: cluster.git
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ff09f18dc25c913d4110ddd72e7caca76d69cb47
X-Git-Newrev: 8d9c236ae53edbc5866b9f357ce082a26772ff10
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Message-Id: <20090504100513.9B3E2120372@lists.fedorahosted.org>
Date: Mon, 04 May 2009 10:05: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-q2/txt/msg00169.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8d9c236ae53edbc5866b9f357ce082a26772ff10
Commit:        8d9c236ae53edbc5866b9f357ce082a26772ff10
Parent:        ff09f18dc25c913d4110ddd72e7caca76d69cb47
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Mon May 4 11:50:03 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Mon May 4 11:59:15 2009 +0200

build: propagate relative info about /sbin vs sbindir

this is required to avoid hardlinking of some tools
---
 configure             |    3 +++
 make/defines.mk.input |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 573b3c5..6ac6ed2 100755
--- a/configure
+++ b/configure
@@ -4,6 +4,7 @@ use warnings;
 use Getopt::Long;
 use Cwd 'abs_path';
 use File::Basename;
+use File::Spec;
 
 print "\nConfiguring Makefiles for your system...\n";
 
@@ -308,6 +309,7 @@ if (!$mandir) {
 if (!$sbindir) {
   $sbindir="${prefix}/sbin";
 }
+$relativesbin=File::Spec->abs2rel("/sbin", $sbindir);
 if (!$initddir) {
   $initddir="/etc/init.d";
 }
@@ -413,6 +415,7 @@ while (<IFILE>) {
   $_ =~ s/\@LIBEXECDIR\@/$libexecdir/;
   $_ =~ s/\@MANDIR\@/$mandir/;
   $_ =~ s/\@SBINDIR\@/$sbindir/;
+  $_ =~ s/\@RELATIVESBIN\@/$relativesbin/;
   $_ =~ s/\@PREFIX\@/$prefix/;
   $_ =~ s/\@INITDDIR\@/$initddir/;
   $_ =~ s/\@SHAREDIR\@/$sharedir/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index ba4038e..afc48b0 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -1,6 +1,7 @@
 # Install Locations
 prefix ?= ${DESTDIR}@PREFIX@
 sbindir ?= ${DESTDIR}@SBINDIR@
+relativesbin ?= @RELATIVESBIN@
 initddir ?= ${DESTDIR}@INITDDIR@
 libdir ?= ${DESTDIR}@LIBDIR@
 libexecdir ?= ${DESTDIR}@LIBEXECDIR@