From 1adb588f84b1a9340beac2719c0890a05e2dfaad Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 12 Feb 2019 18:33:04 +0100
Subject: Fix install phase in build system

- Install of (mainly) documentation caused rebuild and
  modification of the source tree even when the source
  previously had been built. Also otp_patch_apply
  modified the source tree when updating documentation.
  This messed up the installation if installation was
  performed by another user than the user that originally
  built the system which not is an uncommon scenario.

- Some documentation was installed by copying files
  instead of installing the files which caused faulty
  access rights on files.

- The documentation was not properly updated when
  applying a patch using otp_patch_apply.
---
 lib/common_test/priv/Makefile.in |  4 +++-
 lib/debugger/doc/src/Makefile    |  3 +--
 lib/gs/doc/src/Makefile          |  3 +--
 lib/ic/doc/src/Makefile          |  2 +-
 lib/jinterface/doc/src/Makefile  | 10 ++--------
 5 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/common_test/priv/Makefile.in b/lib/common_test/priv/Makefile.in
index 1bc6b82ebb..76baead8f6 100644
--- a/lib/common_test/priv/Makefile.in
+++ b/lib/common_test/priv/Makefile.in
@@ -67,7 +67,9 @@ JS = jquery-latest.js jquery.tablesorter.min.js
 #
 
 include ../../test_server/vsn.mk
-debug opt:
+debug opt: install.sh
+
+install.sh: ../install.sh.in ../vsn.mk ../../test_server/vsn.mk
 	$(V_at)sed -e 's;@CT_VSN@;$(VSN);' \
             -e 's;@TS_VSN@;$(TEST_SERVER_VSN);' \
             ../install.sh.in > install.sh
diff --git a/lib/debugger/doc/src/Makefile b/lib/debugger/doc/src/Makefile
index 9d12893c86..9a1eec20c1 100644
--- a/lib/debugger/doc/src/Makefile
+++ b/lib/debugger/doc/src/Makefile
@@ -112,8 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_docs_spec: docs
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	(/bin/cp -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
+	$(INSTALL_DIR_DATA) $(HTMLDIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
diff --git a/lib/gs/doc/src/Makefile b/lib/gs/doc/src/Makefile
index bfc5e4c317..a7121e997b 100644
--- a/lib/gs/doc/src/Makefile
+++ b/lib/gs/doc/src/Makefile
@@ -146,8 +146,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_docs_spec: docs
 	$(INSTALL_DIR)  "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DATA) $(TOP_PDF_FILE)  "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	(/bin/cp -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
+	$(INSTALL_DIR_DATA) $(HTMLDIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile
index af76cdeaaa..3561cb620f 100644
--- a/lib/ic/doc/src/Makefile
+++ b/lib/ic/doc/src/Makefile
@@ -224,7 +224,7 @@ release_docs_spec: docs
 	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	(/bin/cp -rf  $(HTMLDIR) "$(RELSYSDIR)/doc")
+	$(INSTALL_DIR_DATA) $(HTMLDIR) "$(RELSYSDIR)/doc/html"
 	$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
 	$(INSTALL_DATA) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
 
diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile
index 4d5713566c..069a5bef1f 100644
--- a/lib/jinterface/doc/src/Makefile
+++ b/lib/jinterface/doc/src/Makefile
@@ -144,6 +144,7 @@ clean clean_docs:
 jdoc:$(JAVA_SRC_FILES)
 	(cd ../../java_src;$(JAVADOC) -sourcepath . -d $(JAVADOC_DEST) \
 		-windowtitle $(JAVADOC_TITLE) $(JAVADOC_PKGS))
+	touch jdoc
 
 man: 
 
@@ -162,15 +163,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
 release_docs_spec: docs
 	$(INSTALL_DIR) "$(RELSYSDIR)/doc/pdf"
 	$(INSTALL_DATA) $(TOP_PDF_FILE) "$(RELSYSDIR)/doc/pdf"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html"
-	$(INSTALL_DIR) "$(RELSYSDIR)/doc/html/java/$(JAVA_PKG_PATH)"
 	$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
-	(/bin/cp -rf  ../html "$(RELSYSDIR)/doc")
-
-#	$(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \
-#		"$(RELSYSDIR)/doc/html"
-#	$(INSTALL_DATA) $(JAVA_EXTRA_FILES) "$(RELSYSDIR)/doc/html/java"
-#	$(INSTALL_DATA) $(TOP_HTML_FILES) "$(RELSYSDIR)/doc"
+	$(INSTALL_DIR_DATA) $(HTMLDIR) "$(RELSYSDIR)/doc/html"
 
 
 release_spec:
-- 
cgit v1.2.3