From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15216 invoked by alias); 4 May 2009 09:52:32 -0000 Received: (qmail 15190 invoked by alias); 4 May 2009 09:52:31 -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: STABLE3 - 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/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 7eadccce5c7455a8fb738b8f81c11f293c22f432 X-Git-Newrev: 844967287b4174065a39bf4554d049b68e4dde40 From: "Fabio M. Di Nitto" Message-Id: <20090504095116.8AA40120371@lists.fedorahosted.org> Date: Mon, 04 May 2009 09:52: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-q2/txt/msg00166.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=844967287b4174065a39bf4554d049b68e4dde40 Commit: 844967287b4174065a39bf4554d049b68e4dde40 Parent: 7eadccce5c7455a8fb738b8f81c11f293c22f432 Author: Fabio M. Di Nitto AuthorDate: Mon May 4 11:50:03 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Mon May 4 11:50:03 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 2e9b74c..5949111 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"; @@ -572,6 +573,7 @@ if (!$mandir) { if (!$sbindir) { $sbindir="${prefix}/sbin"; } +$relativesbin=File::Spec->abs2rel("/sbin", $sbindir); if (!$initddir) { $initddir="/etc/init.d"; } @@ -775,6 +777,7 @@ while () { $_ =~ 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 f555a69..d1de004 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@