From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-10870-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 6109 invoked by alias); 4 May 2009 10:06:46 -0000
Received: (qmail 6097 invoked by alias); 4 May 2009 10:06:45 -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: gfs2-utils: master - build: propagate relative info about /sbin vs
	sbindir
To: cluster-cvs-relay@redhat.com
X-Project: Cluster Project
X-Git-Module: gfs2-utils.git
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 05d5e90c22e53426fe9e3642dd09cb230eecdb9e
X-Git-Newrev: 9c32940859baabb0f905b33445f8d6fde7d54d5b
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Message-Id: <20090504100619.50D76120371@lists.fedorahosted.org>
Date: Mon, 04 May 2009 10:06: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/msg00175.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=9c32940859baabb0f905b33445f8d6fde7d54d5b
Commit:        9c32940859baabb0f905b33445f8d6fde7d54d5b
Parent:        05d5e90c22e53426fe9e3642dd09cb230eecdb9e
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 12:03:59 2009 +0200

build: propagate relative info about /sbin vs sbindir

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

diff --git a/configure b/configure
index ce37f09..b400892 100755
--- a/configure
+++ b/configure
@@ -5,6 +5,7 @@ use Getopt::Long;
 use POSIX qw(uname);
 use Cwd 'abs_path';
 use File::Basename;
+use File::Spec;
 
 print "\nConfiguring Makefiles for your system...\n";
 
@@ -379,6 +380,7 @@ if (!$mandir) {
 if (!$sbindir) {
   $sbindir="${prefix}/sbin";
 }
+$relativesbin=File::Spec->abs2rel("/sbin", $sbindir);
 if (!$initddir) {
   $initddir="/etc/init.d";
 }
@@ -473,6 +475,8 @@ while (<IFILE>) {
   $_ =~ s/\@OPENAISLIBDIR\@/$openaislibdir/;
   $_ =~ s/\@MANDIR\@/$mandir/;
   $_ =~ s/\@SBINDIR\@/$sbindir/;
+  $_ =~ s/\@RELATIVESBIN\@/$relativesbin/;
+  $_ =~ s/\@PREFIX\@/$prefix/;
   $_ =~ s/\@INITDDIR\@/$initddir/;
   $_ =~ s/\@DOCDIR\@/$docdir/;
   $_ =~ s/\@LOGDIR\@/$logdir/;
diff --git a/make/defines.mk.input b/make/defines.mk.input
index 9e9a4b3..8b2f5e7 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -1,5 +1,6 @@
 # Install Locations
 sbindir ?= ${DESTDIR}@SBINDIR@
+relativesbin ?= @RELATIVESBIN@
 initddir ?= ${DESTDIR}@INITDDIR@
 libdir ?= ${DESTDIR}@LIBDIR@
 docdir ?= ${DESTDIR}@DOCDIR@