From d4d392087f8ee049ed8f476e5ae780cbc0d0012a Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 17 May 2012 08:14:57 -0400 Subject: [PATCH] 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 Signed-off-by: Steve Dickson --- utils/osd_login/Makefile.am | 11 ++++------- 1 file 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 -- 2.39.5