source3/script: fix installman.sh after the last build-manpages-nogit change

[nivanova/samba-autobuild/.git] / source3 / script / installman.sh

diff --git a/source3/script/installman.sh b/source3/script/installman.sh
index 2bb490f011e8b93def1feed49e6f265ca35382c3..b029089ab2d0fc35e3f26bc81af8908e632ad2f2 100755 (executable)
--- a/source3/script/installman.sh
+++ b/source3/script/installman.sh
@@ -13,14 +13,15 @@ if [ $# -ge 4 ] ; then
   GROFF=$4                    # sh cmd line, including options 
 fi
 
-if test ! -d $SRCDIR../docs/manpages; then
-       echo "No manpages present.  SVN development version maybe?"
+if test ! -d $SRCDIR../bin/docs/manpages; then
+       echo "No manpages present.  Development version maybe?"
        exit 0
 fi
 
 # Get the configured feature set
 test -f "${SRCDIR}/config.log" && \
-       eval `grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log"`
+       eval `grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log" |
+             grep -v ^MANDIR | grep -v ^SRCDIR`
 
 for lang in $langs; do
     if [ "X$lang" = XC ]; then
@@ -43,13 +44,12 @@ for lang in $langs; do
 
     for sect in 1 5 7 8 ; do
        for m in $langdir/man$sect ; do
-           for s in $SRCDIR../docs/manpages/$lang/*$sect; do
+           for s in $SRCDIR../bin/docs/manpages/$lang/*$sect; do
            MP_BASENAME=`basename $s`
 
            # Check if this man page if required by the configured feature set
            case "${MP_BASENAME}" in
                smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
-               smbmnt.8|smbmount.8) test -z "${SMBMOUNT_PROGS}" && continue ;;
                *) ;;
            esac