[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH gfs2-utils] install mkfs.gfs2 into /sbin, not /usr/sbin



Fabio mentioned that "make install" was putting mkfs.gfs2 in /usr/sbin,
rather than in /sbin as it used to.  Here's the fix:

>From 457549978cfc2ad00c56df2cca0dccfcf6f49cb6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering redhat com>
Date: Mon, 28 Sep 2009 17:32:04 +0200
Subject: [PATCH gfs2-utils] 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

--
1.6.5.rc2.177.ga9dd6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]