svn commit: samba r21816 - in branches/SAMBA_3_0_25/source: .

lmuelle at samba.org lmuelle at samba.org
Tue Mar 13 07:30:27 GMT 2007


Author: lmuelle
Date: 2007-03-13 07:30:26 +0000 (Tue, 13 Mar 2007)
New Revision: 21816

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21816

Log:
Merge missing hunks of rev 20663, 20664, 20666, and 20668 to install
smbmount, smbmnt, smbumount, and the man pages only if configure was
called --with-smbmount.

Modified:
   branches/SAMBA_3_0_25/source/Makefile.in
   branches/SAMBA_3_0_25/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0_25/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0_25/source/Makefile.in	2007-03-13 05:10:31 UTC (rev 21815)
+++ branches/SAMBA_3_0_25/source/Makefile.in	2007-03-13 07:30:26 UTC (rev 21816)
@@ -159,7 +159,8 @@
 	bin/locktest2 at EXEEXT@ bin/nsstest at EXEEXT@ bin/vfstest at EXEEXT@ \
 	bin/pdbtest at EXEEXT@ bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@
 
-BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@
+BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@ \
+	@SMBMOUNT_PROGS@
 
 EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
 	bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
@@ -1655,7 +1656,8 @@
 	@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
 
 installman: installdirs
-	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
+	@SMBMOUNT_PROGS="@SMBMOUNT_PROGS@" $(SHELL) \
+		$(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
 
 .PHONY: showlayout
 

Modified: branches/SAMBA_3_0_25/source/configure.in
===================================================================
--- branches/SAMBA_3_0_25/source/configure.in	2007-03-13 05:10:31 UTC (rev 21815)
+++ branches/SAMBA_3_0_25/source/configure.in	2007-03-13 07:30:26 UTC (rev 21816)
@@ -299,6 +299,7 @@
 AC_SUBST(INSTALL_PAM_MODULES)
 AC_SUBST(UNINSTALL_PAM_MODULES)
 AC_SUBST(EXTRA_BIN_PROGS)
+AC_SUBST(SMBMOUNT_PROGS)
 AC_SUBST(CIFSMOUNT_PROGS)
 AC_SUBST(INSTALL_CIFSMOUNT)
 AC_SUBST(UNINSTALL_CIFSMOUNT)
@@ -4034,7 +4035,7 @@
 	*linux*)
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(WITH_SMBMOUNT,1,[Whether to build smbmount])
-		EXTRA_BIN_PROGS="$EXTRA_BIN_PROGS bin/smbmount bin/smbmnt bin/smbumount"
+		SMBMOUNT_PROGS="bin/smbmount bin/smbmnt bin/smbumount"
 		;;
 	*)
 		AC_MSG_ERROR(not on a linux system!)



More information about the samba-cvs mailing list