summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Müller <lmuelle@samba.org>2007-01-10 19:16:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:01 -0500
commit83a41eb3a716045bbf283d155b0a605ce7964bf7 (patch)
tree5fc7a02824bda165843c5fbe0c2f3a2c8d737a74
parentb5e262dbd06a2b0f582dc3da59dba05c4e4312cf (diff)
downloadsamba-83a41eb3a716045bbf283d155b0a605ce7964bf7.tar.gz
samba-83a41eb3a716045bbf283d155b0a605ce7964bf7.tar.bz2
samba-83a41eb3a716045bbf283d155b0a605ce7964bf7.zip
r20663: Do not install smbmount man page if we didn't called configure
--with-smbmount. (This used to be commit ee12348cf1e93d0e75714f3883bfea6525797dc1)
-rw-r--r--source3/Makefile.in5
-rw-r--r--source3/configure.in3
-rwxr-xr-xsource3/script/installman.sh1
3 files changed, 6 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index a81d203f6c..31e01b6fb6 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -163,7 +163,7 @@ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \
bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@ bin/replacetort@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@EXEEXT@ bin/smbfilter@EXEEXT@ \
bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
@@ -1714,7 +1714,8 @@ revert:
@$(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
diff --git a/source3/configure.in b/source3/configure.in
index b40e8aa8c0..83d3c3dccc 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -302,6 +302,7 @@ AC_SUBST(SMBWRAPPER)
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 @@ AC_ARG_WITH(smbmount,
*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!)
diff --git a/source3/script/installman.sh b/source3/script/installman.sh
index 869ce6ee38..b879c79022 100755
--- a/source3/script/installman.sh
+++ b/source3/script/installman.sh
@@ -49,6 +49,7 @@ for lang in $langs; do
# 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