summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-05-17 08:14:57 -0400
committerSteve Dickson <steved@redhat.com>2012-05-17 08:15:59 -0400
commitd4d392087f8ee049ed8f476e5ae780cbc0d0012a (patch)
tree523a2158dd23d8cf222fda7d9bf6c963db755f31
parenta69f6aeb19841f5a95c3eb4f4e5fe5ca0db247f4 (diff)
downloadnfs-utils-d4d392087f8ee049ed8f476e5ae780cbc0d0012a.tar.gz
nfs-utils-d4d392087f8ee049ed8f476e5ae780cbc0d0012a.tar.xz
nfs-utils-d4d392087f8ee049ed8f476e5ae780cbc0d0012a.zip
osd_login - ensure /sbin is created before installation.
If we use a more standard approach to describing the osd_login script, the automake infrastructure will create /sbin before attempting installation. This is important for: make DESTDIR=/empty-dir install Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--utils/osd_login/Makefile.am11
1 files changed, 4 insertions, 7 deletions
diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am
index adc493a..20c2d8c 100644
--- a/utils/osd_login/Makefile.am
+++ b/utils/osd_login/Makefile.am
@@ -1,12 +1,9 @@
## Process this file with automake to produce Makefile.in
-OSD_LOGIN_FILES= osd_login
+# These binaries go in /sbin (not /usr/sbin), and that cannot be
+# overridden at config time.
+sbindir = /sbin
-EXTRA_DIST= $(OSD_LOGIN_FILES)
-
-all-local: $(OSD_LOGIN_FILES)
-
-install-data-hook:
- $(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login
+sbin_SCRIPTS = osd_login
MAINTAINERCLEANFILES = Makefile.in