openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File mkdir-sbin of Package nfs-utils (Revision 87c8a73646ed7dc35676600cf1116a88)

Currently displaying revision 87c8a73646ed7dc35676600cf1116a88 , Show latest

commit 03bb227402ab023f4badb515022d49f82e01ff8d
Author: Neil Brown <neilb@suse.de>
Date:   Thu May 17 16:40:40 2012 +1000

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>

diff --git a/utils/osd_login/Makefile.am b/utils/osd_login/Makefile.am
index adc493a..d17ffa7 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
+# overriden 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

Places

File mkdir-sbin of Package nfs-utils (Revision 87c8a73646ed7dc35676600cf1116a88)

Places