gfs2-utils: master - GFS2: Make mount.gfs2 install to the correct location

Steven Whitehouse swhiteho at fedoraproject.org
Fri Oct 1 13:53:28 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=015b6aeef919280b3d74dc36506e7237f8ed376f
Commit:        015b6aeef919280b3d74dc36506e7237f8ed376f
Parent:        bb24408b4dc8d49de583001eefa87ea46de89028
Author:        Steven Whitehouse <swhiteho at redhat.com>
AuthorDate:    Fri Oct 1 14:30:57 2010 +0100
Committer:     Steven Whitehouse <swhiteho at redhat.com>
CommitterDate: Fri Oct 1 14:30:57 2010 +0100

GFS2: Make mount.gfs2 install to the correct location

This had the same issue as mkfs.gfs2, so fix it up in the same way

Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
---
 gfs2/mount/Makefile.am |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gfs2/mount/Makefile.am b/gfs2/mount/Makefile.am
index 0303b24..249e133 100644
--- a/gfs2/mount/Makefile.am
+++ b/gfs2/mount/Makefile.am
@@ -1,9 +1,13 @@
 MAINTAINERCLEANFILES	= Makefile.in
 
-# install into /sbin, not /usr/sbin
-sbindir := $(shell test '$(exec_prefix):$(sbindir)' = /usr:/usr/sbin \
-	     && echo /sbin \
-	     || echo '$(exec_prefix)/sbin')
+# 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		= mount.gfs2
 


More information about the cluster-commits mailing list