aboutsummaryrefslogtreecommitdiffstats
path: root/lib/jinterface/doc
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-04 16:41:57 +0100
committerRickard Green <[email protected]>2019-03-04 16:41:57 +0100
commit05c5720845e0e2142a3b1c6e4b1e9f1e22c19a5c (patch)
tree3490fad1d27e890b9325d48519f1c11ed7cb9611 /lib/jinterface/doc
parent2052caebf9a9b8d25e1873d9c850b272a98d4680 (diff)
parentb32a929bbb287c318f44cb0ecf17716c480f11ee (diff)
downloadotp-05c5720845e0e2142a3b1c6e4b1e9f1e22c19a5c.tar.gz
otp-05c5720845e0e2142a3b1c6e4b1e9f1e22c19a5c.tar.bz2
otp-05c5720845e0e2142a3b1c6e4b1e9f1e22c19a5c.zip
Merge 'rickard/make-fixes-21/OTP-15551' into 'rickard/make-fixes-22/OTP-15551'
* rickard/make-fixes-21/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.
Diffstat (limited to 'lib/jinterface/doc')
-rw-r--r--lib/jinterface/doc/src/Makefile10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile
index d80bb38ec1..f5cba9d074 100644
--- a/lib/jinterface/doc/src/Makefile
+++ b/lib/jinterface/doc/src/Makefile
@@ -137,6 +137,7 @@ clean clean_docs:
jdoc:$(JAVA_SRC_FILES)
(cd ../../java_src;$(JAVADOC) -sourcepath . -d $(JAVADOC_DEST) \
-windowtitle $(JAVADOC_TITLE) $(JAVADOC_PKGS))
+ touch jdoc
man:
@@ -152,15 +153,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)"
- ($(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: