Prevent doc/src/sgml subdirs from being created, instead of deleting

them after the fact.  This is a more elegant fix for bug #5595.
This commit is contained in:
Alvaro Herrera 2010-09-24 01:32:52 -04:00
parent 0a8ed2cdb4
commit fde5ce4fe2

View File

@ -22,7 +22,11 @@ sourcetree=`cd $1 && pwd`
buildtree=`cd ${2:-'.'} && pwd`
for item in `find "$sourcetree" -type d \( \( -name CVS -prune \) -o \( -name .git -prune \) -o -print \)`; do
# We must not auto-create the subdirectories holding built documentation.
# If we did, it would interfere with installation of prebuilt docs from
# the source tree, if a VPATH build is done from a distribution tarball.
# See bug #5595.
for item in `find "$sourcetree" -type d \( \( -name CVS -prune \) -o \( -name .git -prune \) -o \( -path "$sourcetree/doc/src/sgml/*" -prune \) -o -print \)`; do
subdir=`expr "$item" : "$sourcetree\(.*\)"`
if test ! -d "$buildtree/$subdir"; then
mkdir -p "$buildtree/$subdir" || exit 1
@ -38,13 +42,4 @@ for item in `find "$sourcetree" -name Makefile -print -o -name GNUmakefile -prin
fi
done
# We must not auto-create the subdirectories holding built documentation.
# If we did, it would interfere with installation of prebuilt docs from
# the source tree, if a VPATH build is done from a distribution tarball.
# See bug #5595.
rmdir "$buildtree/doc/src/sgml/html" 2>/dev/null
rmdir "$buildtree/doc/src/sgml/man1" 2>/dev/null
rmdir "$buildtree/doc/src/sgml/man3" 2>/dev/null
rmdir "$buildtree/doc/src/sgml/man7" 2>/dev/null
exit 0