public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE3 - build: propagate relative info about /sbin vs sbindir Date: Mon, 04 May 2009 09:52:00 -0000 [thread overview] Message-ID: <20090504095116.8AA40120371@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=844967287b4174065a39bf4554d049b68e4dde40 Commit: 844967287b4174065a39bf4554d049b68e4dde40 Parent: 7eadccce5c7455a8fb738b8f81c11f293c22f432 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: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 (<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 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@
reply other threads:[~2009-05-04 9:52 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090504095116.8AA40120371@lists.fedorahosted.org \ --to=fabbione@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).