svn commit: samba r11728 - branches/SAMBA_3_0/source/script
trunk/source/script
lmuelle at samba.org
lmuelle at samba.org
Mon Nov 14 21:18:10 GMT 2005
Author: lmuelle
Date: 2005-11-14 21:18:09 +0000 (Mon, 14 Nov 2005)
New Revision: 11728
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11728
Log:
Ensure to check for the config.log in ${SRCDIR}.
Revert jerry's revert from 11685. :)
At the moment I don't see a way to check if there is an empty
${SMBWRAPPER} or none. If there is a way to check if ${SMBWRAPPER}
isn't set at all we could make the installman script even work if
config.log does not exist.
Modified:
branches/SAMBA_3_0/source/script/installman.sh
trunk/source/script/installman.sh
Changeset:
Modified: branches/SAMBA_3_0/source/script/installman.sh
===================================================================
--- branches/SAMBA_3_0/source/script/installman.sh 2005-11-14 20:13:00 UTC (rev 11727)
+++ branches/SAMBA_3_0/source/script/installman.sh 2005-11-14 21:18:09 UTC (rev 11728)
@@ -18,6 +18,10 @@
exit 0
fi
+# Get the configured feature set
+test -f "${SRCDIR}/config.log" && \
+ eval $( grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log")
+
for lang in $langs; do
if [ "X$lang" = XC ]; then
echo Installing default man pages in $MANDIR/
@@ -40,13 +44,20 @@
for sect in 1 5 7 8 ; do
for m in $langdir/man$sect ; do
for s in $SRCDIR../docs/manpages/$lang/*$sect; do
- FNAME=$m/`basename $s`
-
+ MP_BASENAME=${s##*/}
+
+ # Check if this man page if required by the configured feature set
+ case "${MP_BASENAME}" in
+ smbsh.1) test -z "${SMBWRAPPER}" && continue ;;
+ *) ;;
+ esac
+
+ FNAME="$m/${MP_BASENAME}"
+
# Test for writability. Involves
# blowing away existing files.
if (rm -f $FNAME && touch $FNAME); then
- rm $FNAME
if [ "x$GROFF" = x ] ; then
cp $s $m # Copy raw nroff
else
Modified: trunk/source/script/installman.sh
===================================================================
--- trunk/source/script/installman.sh 2005-11-14 20:13:00 UTC (rev 11727)
+++ trunk/source/script/installman.sh 2005-11-14 21:18:09 UTC (rev 11728)
@@ -19,8 +19,8 @@
fi
# Get the configured feature set
-test -f config.log && \
- eval $( grep "^[[:alnum:]]*=.*" config.log)
+test -f "${SRCDIR}/config.log" && \
+ eval $( grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log")
for lang in $langs; do
if [ "X$lang" = XC ]; then
More information about the samba-cvs
mailing list