cluster: master - build: propagate relative info about /sbin vs sbindir

cluster: master - build: propagate relative info about /sbin vs sbindir

[Fabio M. Di Nitto]

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@