sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r20663: Do not install smbmount man page if we didn't called configure

Browse Source 
--with-smbmount.
This commit is contained in:
Lars Müller 2007-01-10 19:16:59 +00:00 committed by Gerald (Jerry) Carter
parent b6347751d8
commit ee12348cf1
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/Makefile.in
View File

@ -163,7 +163,7 @@ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \ bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \
bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@ bin/replacetort@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@ \ EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \
bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \ bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
@ -1714,7 +1714,8 @@ revert:
@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS) @$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
installman: installdirs 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 .PHONY: showlayout

3
source/configure.in
View File

@ -302,6 +302,7 @@ AC_SUBST(SMBWRAPPER)
AC_SUBST(SMBWRAP_OBJS) AC_SUBST(SMBWRAP_OBJS)
AC_SUBST(SMBWRAP_INC) AC_SUBST(SMBWRAP_INC)
AC_SUBST(EXTRA_BIN_PROGS) AC_SUBST(EXTRA_BIN_PROGS)
AC_SUBST(SMBMOUNT_PROGS)
AC_SUBST(CIFSMOUNT_PROGS) AC_SUBST(CIFSMOUNT_PROGS)
AC_SUBST(INSTALL_CIFSMOUNT) AC_SUBST(INSTALL_CIFSMOUNT)
AC_SUBST(UNINSTALL_CIFSMOUNT) AC_SUBST(UNINSTALL_CIFSMOUNT)
@ -4016,7 +4017,7 @@ AC_ARG_WITH(smbmount,
*linux*) *linux*)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(WITH_SMBMOUNT,1,[Whether to build smbmount]) 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!) AC_MSG_ERROR(not on a linux system!)

1
source/script/installman.sh
View File

@ -49,6 +49,7 @@ for lang in $langs; do
# Check if this man page if required by the configured feature set # Check if this man page if required by the configured feature set
case "${MP_BASENAME}" in case "${MP_BASENAME}" in
smbsh.1) test -z "${SMBWRAPPER}" && continue ;; smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
smbmount.8) test -z "${SMBMOUNT_PROGS}" && continue ;;
*) ;; *) ;;
esac esac