Adjust regex to match variable names including underscores

[samba.git] / source / script / installman.sh

diff --git a/source/script/installman.sh b/source/script/installman.sh
index 3bbca1a8aa5641f03f74f720066c75d8ad8b4423..085e86227c29f732e6e9f216ffc4dee37575038c 100755 (executable)
--- a/source/script/installman.sh
+++ b/source/script/installman.sh
@@ -14,13 +14,13 @@ if [ $# -ge 4 ] ; then
 fi
 
 if test ! -d $SRCDIR../docs/manpages; then
-       echo "No manpages present.  SVN development version maybe?"
+       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"`
 
 for lang in $langs; do
     if [ "X$lang" = XC ]; then
@@ -44,10 +44,11 @@ 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
-           MP_BASENAME=${s##*/}
+           MP_BASENAME=`basename $s`
 
            # Check if this man page if required by the configured feature set
            case "${MP_BASENAME}" in
+               cifs.upcall.8) test -z "${CIFSUPCALL_PROGS}" && continue ;;
                smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
                *) ;;
            esac