postgres.git / summary / log / commit / refs

commit    b98317c8aa8b5ff900319dc4721f73669ea40870
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Aug 26 18:34:44 2010 +0000

    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.


 config/prep_buildtree | 9 +++++++++
 1 file changed, 9 insertions(+)

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


[parent: 2d685d4ec0b2]