diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-26 18:34:44 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-26 18:34:44 +0000 |
| commit | b98317c8aa8b5ff900319dc4721f73669ea40870 (patch) | |
| tree | 43f4ca0543cc8b270bed6f06e3b75aaf1562f44d | |
| parent | 2d685d4ec0b2b6c1e810a784f1d5ed9f9b2739e5 (diff) | |
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.
| -rw-r--r-- | config/prep_buildtree | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/prep_buildtree b/config/prep_buildtree index 57d77196733..f9164cfa2fa 100644 --- a/config/prep_buildtree +++ b/config/prep_buildtree @@ -38,4 +38,13 @@ 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 |