aboutsummaryrefslogtreecommitdiffstats
path: root/lib/jinterface/doc/src/Makefile
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-04 16:28:56 +0100
committerRickard Green <[email protected]>2019-03-04 16:28:56 +0100
commit2599dcfc973d30cfdf438d4587885eda154522ab (patch)
tree04d051081cf98327778cb120ae457247eb048f35 /lib/jinterface/doc/src/Makefile
parentdb6059a9217767a6e42e93cec05089c0ec977d20 (diff)
parent565adc6d7ffb0778df06d5011ec56dc7b3eb0d2b (diff)
downloadotp-2599dcfc973d30cfdf438d4587885eda154522ab.tar.gz
otp-2599dcfc973d30cfdf438d4587885eda154522ab.tar.bz2
otp-2599dcfc973d30cfdf438d4587885eda154522ab.zip
Merge 'rickard/make-fixes-19/OTP-15551' into 'rickard/make-fixes-20/OTP-15551'
* rickard/make-fixes-19/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/src/Makefile')
-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 37de0a35c5..c8e58c9f95 100644
--- a/lib/jinterface/doc/src/Makefile
+++ b/lib/jinterface/doc/src/Makefile
@@ -136,6 +136,7 @@ clean clean_docs:
jdoc:$(JAVA_SRC_FILES)
(cd ../../java_src;$(JAVADOC) -sourcepath . -d $(JAVADOC_DEST) \
-windowtitle $(JAVADOC_TITLE) $(JAVADOC_PKGS))
+ touch jdoc
man:
@@ -151,15 +152,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: