Gitweb:
http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: 457549978cfc2ad00c56df2cca0dccfcf6f49cb6
Parent: 2a2ebaa7b22b754da4401cb1bdceef4ea0573406
Author: Jim Meyering <meyering(a)redhat.com>
AuthorDate: Mon Sep 28 17:32:04 2009 +0200
Committer: Jim Meyering <meyering(a)redhat.com>
CommitterDate: Mon Sep 28 17:32:04 2009 +0200
install mkfs.gfs2 into /sbin, not /usr/sbin
* gfs2/fsck/Makefile.am (sbindir): Adapt sbindir override to work.
This may be required solely for automake-1.11 and newer, but I
haven't confirmed.
---
gfs2/fsck/Makefile.am | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gfs2/fsck/Makefile.am b/gfs2/fsck/Makefile.am
index ac89524..e6a621f 100644
--- a/gfs2/fsck/Makefile.am
+++ b/gfs2/fsck/Makefile.am
@@ -1,9 +1,12 @@
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 = fsck.gfs2