gfs2-utils: master - gfs2-utils: Honour --sbindir
Andrew Price
andyp at fedoraproject.org
Mon Nov 3 20:02:06 UTC 2014
Gitweb: http://git.fedorahosted.org/git/?p=gfs2-utils.git;a=commitdiff;h=05cec12283b7652144a57460166a8147cf3e5144
Commit: 05cec12283b7652144a57460166a8147cf3e5144
Parent: 1be9a5c934cb239e3374d093c3ff0ad9857945aa
Author: Andrew Price <anprice at redhat.com>
AuthorDate: Sat Nov 1 13:48:53 2014 +0000
Committer: Andrew Price <anprice at redhat.com>
CommitterDate: Sat Nov 1 13:53:36 2014 +0000
gfs2-utils: Honour --sbindir
If the user specifies --sbindir=foo then we should honour it.
fsck/Makefile.am and scripts/Makefile.am were the only remaining
directories with this shell snippet.
Signed-off-by: Andrew Price <anprice at redhat.com>
---
gfs2/fsck/Makefile.am | 8 --------
gfs2/scripts/Makefile.am | 9 ---------
2 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/gfs2/fsck/Makefile.am b/gfs2/fsck/Makefile.am
index 92d56f3..b34833b 100644
--- a/gfs2/fsck/Makefile.am
+++ b/gfs2/fsck/Makefile.am
@@ -1,13 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
-# When an exec_prefix setting would have us install into /usr/sbin,
-# use /sbin instead.
-# Accept an existing sbindir value of /usr/sbin (probably for older automake),
-# or an empty value, for automake-1.11 and newer.
-sbindir := $(shell rpl=0; test '$(exec_prefix):$(sbindir)' = /usr:/usr/sbin \
- || test '$(exec_prefix):$(sbindir)' = /usr: && rpl=1; \
- test $$rpl = 1 && echo /sbin || echo '$(exec_prefix)/sbin')
-
sbin_PROGRAMS = fsck.gfs2
noinst_HEADERS = fsck.h fs_recovery.h \
diff --git a/gfs2/scripts/Makefile.am b/gfs2/scripts/Makefile.am
index 2c51222..1c98f95 100644
--- a/gfs2/scripts/Makefile.am
+++ b/gfs2/scripts/Makefile.am
@@ -1,12 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
-# When an exec_prefix setting would have us install into /usr/sbin,
-# use /sbin instead.
-# Accept an existing sbindir value of /usr/sbin (probably for older automake),
-# or an empty value, for automake-1.11 and newer.
-sbindir := $(shell rpl=0; test '$(exec_prefix):$(sbindir)' = /usr:/usr/sbin \
- || test '$(exec_prefix):$(sbindir)' = /usr: && rpl=1; \
- test $$rpl = 1 && echo /sbin || echo '$(exec_prefix)/sbin')
-
-
dist_sbin_SCRIPTS = gfs2_lockcapture gfs2_trace
More information about the cluster-commits
mailing list