aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2015-05-12 12:30:50 -0400
committerBruce Momjian <bruce@momjian.us>2015-05-12 12:30:50 -0400
commitea12b3ca8cf4d5d4a35f6ca49f8e5128f716fa90 (patch)
tree0a9170812313ddf7598673a11d03070fbca4e446
parent007c932e5aaf6d68087f134b8557bbb7db149e94 (diff)
downloadpostgresql-ea12b3ca8cf4d5d4a35f6ca49f8e5128f716fa90.tar.gz
postgresql-ea12b3ca8cf4d5d4a35f6ca49f8e5128f716fa90.zip
doc build: use unique Makefile variable to control temp install
-rw-r--r--doc/src/sgml/Makefile2
-rw-r--r--src/Makefile.global.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index f04e57246df..ac3a142bb26 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -17,6 +17,8 @@
# to want to use.
html:
+NO_TEMP_INSTALL=yes
+
subdir = doc/src/sgml
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 7a9af7c49f0..c583b44dbf3 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -303,7 +303,7 @@ check: temp-install
.PHONY: temp-install
temp-install:
-ifdef GENERATED_SGML # not needed for SGML 'make check'
+ifndef NO_TEMP_INSTALL
ifeq ($(MAKELEVEL),0)
rm -rf '$(abs_top_builddir)'/tmp_install
$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install