This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
gfs2-utils: master - build: propagate relative info about /sbin vssbindir
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 4 May 2009 10:06:19 +0000 (UTC)
- Subject: gfs2-utils: master - build: propagate relative info about /sbin vssbindir
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@