Merge 'rickard/make-fixes-17/OTP-15551' into 'rickard/make-fixes-18/OTP-15551'

    * rickard/make-fixes-17/OTP-15551:
        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.

1 files changed, 52 insertions, 37 deletions

diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index 7e3041ce1e..9e676a57fe 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -80,6 +80,25 @@ PDFREFDIR= pdf
 TOP_PDF_FILE = $(PDFDIR)/$(APPLICATION)-$(VSN).pdf
 TOPDOC=true
 
+ifdef RELEASE_PATH
+INST_TYPE=rel
+INST_TYPE_SRC_DIR=$(RELEASE_PATH)
+# We build to the 'temporary' dir in order to be able to install
+# results using INSTALL_DATA (in order to get correct access
+# rights on installed files)
+INST_TYPE_DEST_DIR=$(RELSYSDIR)/temporary
+INST_TYPE_DEST_DIR_DEP=$(INST_TYPE_DEST_DIR)
+INST_TYPE_JS_DEST_DIR=$(INST_TYPE_DEST_DIR)
+INST_TYPE_VSN_FILE=$(INST_TYPE_DEST_DIR)/OTP_VERSION
+else
+INST_TYPE=src
+INST_TYPE_SRC_DIR=$(ERL_TOP)
+INST_TYPE_DEST_DIR=$(HTMLDIR)
+INST_TYPE_DEST_DIR_DEP=
+INST_TYPE_JS_DEST_DIR=$(INST_TYPE_DEST_DIR)/js
+INST_TYPE_VSN_FILE=$(ERL_TOP)/OTP_VERSION
+endif
+
 #--------------------------------------------------------------------------
 # We generate the index page from the installed system. This make
 # it important that this is done last. The file index.html.src
@@ -89,17 +108,18 @@ EBIN = ebin
 
 INDEX_SCRIPT = $(EBIN)/erl_html_tools.$(EMULATOR)
 INDEX_SRC = src/erl_html_tools.erl
-INDEX_FILES = \
-	$(HTMLDIR)/index.html \
-	$(HTMLDIR)/applications.html 
 
-JAVASCRIPT = $(HTMLDIR)/js/erlresolvelinks.js
+INDEX_HTML=$(INST_TYPE_DEST_DIR)/index.html
+APPLICATIONS_HTML=$(INST_TYPE_DEST_DIR)/applications.html
+INDEX_FILES = $(INDEX_HTML) $(APPLICATIONS_HTML)
+
+JAVASCRIPT = $(INST_TYPE_JS_DEST_DIR)/erlresolvelinks.js
 JAVASCRIPT_BUILD_SCRIPT = $(EBIN)/erlresolvelinks.$(EMULATOR)
 JAVASCRIPT_BUILD_SCRIPT_SRC = src/erlresolvelinks.erl
 
 MAN_INDEX_SCRIPT = $(EBIN)/otp_man_index.$(EMULATOR)
 MAN_INDEX_SRC = src/otp_man_index.erl
-MAN_INDEX = $(HTMLDIR)/man_index.html
+MAN_INDEX = $(INST_TYPE_DEST_DIR)/man_index.html
 
 GLOSSARY  = $(HTMLDIR)/glossary.html
 GLOSSARY_SRC = $(ERL_TOP)/system/internal_tools/doctools/src/glossary.erl
@@ -114,44 +134,38 @@ TEMPLATES = \
 $(INDEX_SCRIPT): $(INDEX_SRC)
 	$(ERLC) -o$(EBIN) +warn_unused_vars $<
 
-# We don't list toc_*.html as targets because we don't know
-$(HTMLDIR)/index.html + $(HTMLDIR)/applications.html: $(INDEX_SCRIPT) $(TEMPLATES)
-	echo "Generating index $@"
-# Check if we are building the index from source or an installed release
-	if test "$$RELEASE_ROOT" = "" ; then \
-		$(ERL) -noshell -pa $(EBIN) -s erl_html_tools top_index src $(ERL_TOP) \
-		$(HTMLDIR) $(SYSTEM_VSN) -s erlang halt ;\
+$(INST_TYPE_DEST_DIR)/OTP_VERSION: $(INST_TYPE_DEST_DIR_DEP)
+	if test -f "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)/OTP_VERSION"; then \
+		$(CP) "$(RELEASE_PATH)/releases/$(SYSTEM_VSN)/OTP_VERSION" $@; \
 	else \
-		$(ERL) -noshell -pa $(EBIN) -s erl_html_tools top_index rel $(RELEASE_ROOT) \
-		$(HTMLDIR) $(SYSTEM_VSN) -s erlang halt ;\
+		$(CP) $(ERL_TOP)/OTP_VERSION $@; \
 	fi
 
+# We don't list toc_*.html as targets because we don't know
+$(INDEX_HTML) + $(APPLICATIONS_HTML): $(INST_TYPE_DEST_DIR_DEP) $(INDEX_SCRIPT) $(TEMPLATES) $(INST_TYPE_VSN_FILE)
+	echo "Generating index $@"
+	$(ERL) -noshell -pa $(EBIN) -s erl_html_tools top_index $(INST_TYPE) \
+		$(INST_TYPE_SRC_DIR) $(INST_TYPE_DEST_DIR) \
+		`cat "$(INST_TYPE_VSN_FILE)"` -s erlang halt
+
 
 #--------------------------------------------------------------------------
 
 $(JAVASCRIPT_BUILD_SCRIPT): $(JAVASCRIPT_BUILD_SCRIPT_SRC)
 	$(ERLC) -o$(EBIN) +warn_unused_vars $<
 
-$(JAVASCRIPT): $(JAVASCRIPT_BUILD_SCRIPT)
-	erl -noshell -pa $(EBIN) -s erlresolvelinks make -s erlang halt
-	$(INSTALL_DIR) $(HTMLDIR)/js
-	$(INSTALL_DATA) erlresolvelinks.js $(JAVASCRIPT) 
+$(JAVASCRIPT): $(INST_TYPE_DEST_DIR_DEP) $(JAVASCRIPT_BUILD_SCRIPT)
+	erl -noshell -pa $(EBIN) -run erlresolvelinks make $(ERL_TOP) \
+		$(INST_TYPE_SRC_DIR) $(INST_TYPE_JS_DEST_DIR) -s erlang halt
 
 #--------------------------------------------------------------------------
 
 $(MAN_INDEX_SCRIPT): $(MAN_INDEX_SRC)
 	$(ERLC) -o$(EBIN) +warn_unused_vars $<
 
-$(MAN_INDEX): $(MAN_INDEX_SCRIPT)
-# Check if we are building the index from source or an installed release
-	if test "$$RELEASE_ROOT" = "" ; then \
-		$(ERL) -noshell -pa $(EBIN) -s otp_man_index gen src $(ERL_TOP) $@  \
-			-s erlang halt ;\
-	else \
-		$(ERL) -noshell -pa $(EBIN) -s otp_man_index gen rel $(RELEASE_ROOT) $@  \
-			-s erlang halt ;\
-	fi
-
+$(MAN_INDEX): $(INST_TYPE_DEST_DIR_DEP) $(MAN_INDEX_SCRIPT)
+	$(ERL) -noshell -pa $(EBIN) -s otp_man_index gen $(INST_TYPE) \
+		$(INST_TYPE_SRC_DIR) $@ -s erlang halt
 
 #--------------------------------------------------------------------------
 
@@ -229,19 +243,20 @@ html:   $(INDEX_FILES) \
 debug opt: 
 
 clean:
-	rm -rf 	../html/js
-	rm -f PR.template 
-	rm -f  $(INDEX_FILES) $(MAN_INDEX)
-	rm -f  $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f $(INDEX_SCRIPT) $(GLOSSARY_SCRIPT) \
-		$(JAVASCRIPT_BUILD_SCRIPT) 
-	rm -f erl_crash.dump errs core *~
+	$(RM) -f ../html/js/*.js
+	$(RM) -f PR.template 
+	$(RM) -f $(INDEX_FILES) $(MAN_INDEX)
+	$(RM) -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+	$(RM) -f $(INDEX_SCRIPT) $(GLOSSARY_SCRIPT) $(JAVASCRIPT_BUILD_SCRIPT) 
+	$(RM) -f erl_crash.dump errs core *~
 
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
+$(RELSYSDIR)/temporary:
+	$(INSTALL_DIR) $(RELSYSDIR)/temporary
 
 release_docs_spec: docs
 	$(INSTALL_DIR)  "$(RELEASE_PATH)"
@@ -251,13 +266,13 @@ release_docs_spec: docs
 	$(INSTALL_DATA)  \
 		$(TOP_PDF_FILE) $(RELSYSDIR)/pdf
 	$(INSTALL_DIR)  $(RELSYSDIR)/js
-	$(INSTALL_DATA)  \
-		$(JAVASCRIPT) $(RELSYSDIR)/js
+	$(INSTALL_DATA) $(JAVASCRIPT) $(RELSYSDIR)/js
 	$(INSTALL_DATA) $(INDEX_FILES) $(MAN_INDEX) $(RELSYSDIR)
 	$(INSTALL_DIR)  $(RELSYSDIR)/docbuild
 	$(INSTALL_DATA) $(INDEX_SCRIPT) $(MAN_INDEX_SCRIPT) $(JAVASCRIPT_BUILD_SCRIPT) \
 		$(INDEX_SRC) $(MAN_INDEX_SRC) $(JAVASCRIPT_BUILD_SCRIPT_SRC) \
 		$(TEMPLATES) $(RELSYSDIR)/docbuild
+	$(RM) -rf $(RELSYSDIR)/temporary
 
 
 release_spec: