Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 39ce62b

Browse files
committed
Don't auto-create the subdirectories holding built documentation in a VPATH
build tree. If we actually build the docs in the VPATH tree, those dirs will get created then; but if they're present and empty, they capture the vpathsearch searches in "make install", preventing installation of prebuilt docs that might exist in the source tree. Per bug #5595 from Dmtiriy Igrishin. Fix based on idea from Peter Eisentraut.
1 parent 13e6d6c commit 39ce62b

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

config/prep_buildtree

+9
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,13 @@ for item in `find "$sourcetree" -name Makefile -print -o -name GNUmakefile -prin
3838
fi
3939
done
4040

41+
# We must not auto-create the subdirectories holding built documentation.
42+
# If we did, it would interfere with installation of prebuilt docs from
43+
# the source tree, if a VPATH build is done from a distribution tarball.
44+
# See bug #5595.
45+
rmdir "$buildtree/doc/src/sgml/html" 2>/dev/null
46+
rmdir "$buildtree/doc/src/sgml/man1" 2>/dev/null
47+
rmdir "$buildtree/doc/src/sgml/man3" 2>/dev/null
48+
rmdir "$buildtree/doc/src/sgml/man7" 2>/dev/null
49+
4150
exit 0

0 commit comments

Comments
 (0)