svn commit: samba r20663 - in branches/SAMBA_3_0/source: . script

[lmuelle at samba.org]

Author: lmuelle
Date: 2007-01-10 19:16:59 +0000 (Wed, 10 Jan 2007)
New Revision: 20663

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

Log:
Do not install smbmount man page if we didn't called configure
--with-smbmount.

Modified:
   branches/SAMBA_3_0/source/Makefile.in
   branches/SAMBA_3_0/source/configure.in
   branches/SAMBA_3_0/source/script/installman.sh


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2007-01-10 18:52:16 UTC (rev 20662)
+++ branches/SAMBA_3_0/source/Makefile.in	2007-01-10 19:16:59 UTC (rev 20663)
@@ -163,7 +163,7 @@
 	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) $(BIN_PROGS4) @EXTRA_BIN_PROGS@
+BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) @EXTRA_BIN_PROGS@ @SMBMOUNT_PROGS@
 
 EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
 	bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
@@ -1714,7 +1714,8 @@
 	@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
 
 installman: installdirs
-	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
+	@$(SHELL) SMBMOUNT_PROGS="@SMBMOUNT_PROGS@" \
+		$(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
 
 .PHONY: showlayout
 

Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2007-01-10 18:52:16 UTC (rev 20662)
+++ branches/SAMBA_3_0/source/configure.in	2007-01-10 19:16:59 UTC (rev 20663)
@@ -302,6 +302,7 @@
 AC_SUBST(SMBWRAP_OBJS)
 AC_SUBST(SMBWRAP_INC)
 AC_SUBST(EXTRA_BIN_PROGS)
+AC_SUBST(SMBMOUNT_PROGS)
 AC_SUBST(CIFSMOUNT_PROGS)
 AC_SUBST(INSTALL_CIFSMOUNT)
 AC_SUBST(UNINSTALL_CIFSMOUNT)
@@ -4016,7 +4017,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!)

Modified: branches/SAMBA_3_0/source/script/installman.sh
===================================================================
--- branches/SAMBA_3_0/source/script/installman.sh	2007-01-10 18:52:16 UTC (rev 20662)
+++ branches/SAMBA_3_0/source/script/installman.sh	2007-01-10 19:16:59 UTC (rev 20663)
@@ -49,6 +49,7 @@
 	    # Check if this man page if required by the configured feature set
 	    case "${MP_BASENAME}" in
 	    	smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
+		smbmount.8) test -z "${SMBMOUNT_PROGS}" && continue ;;
 		*) ;;
 	    esac