[linux-cifs-client] [PATCH 1/2] cifs.upcall: move default install location to EPREFIX/sbin

[simo]

On Sat, 2008-08-16 at 22:29 -0400, jlayton at samba.org wrote:
> From: Jeff Layton <jlayton at redhat.com>
> 
> cifs.upcall links to libraries that live under /usr, so installing it
> in /sbin doesn't seem appropriate. Move it to EPREFIX/sbin instead
> (i.e. /usr/sbin).
> 
> Signed-off-by: Jeff Layton <jlayton at redhat.com>
> ---
>  source/Makefile.in |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/source/Makefile.in b/source/Makefile.in
> index 938d711..a1dac20 100644
> --- a/source/Makefile.in
> +++ b/source/Makefile.in
> @@ -176,9 +176,9 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
>  
>  # Note that all executable programs now provide for an optional executable suffix.
>  
> -SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
> +SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
>  
> -ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @CIFSUPCALL_PROGS@
> +ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
>  
>  BIN_PROGS1 = bin/smbclient at EXEEXT@ bin/net at EXEEXT@ bin/smbspool at EXEEXT@ \
>  	bin/testparm at EXEEXT@ bin/smbstatus at EXEEXT@ bin/smbget at EXEEXT@
> @@ -2482,8 +2482,8 @@ installcifsmount:: @CIFSMOUNT_PROGS@
>  	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@
>  
>  installcifsupcall:: @CIFSUPCALL_PROGS@
> -	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR)
> -	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUPCALL_PROGS@
> +	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(SBINDIR)
> +	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) @CIFSUPCALL_PROGS@
>  
>  # Some symlinks are required for the 'probing' of modules.
>  # This mechanism should go at some point..

ack

-- 
Simo Sorce
Samba Team GPL Compliance Officer <simo at samba.org>
Senior Software Engineer at Red Hat Inc. <simo at redhat.com>