diff options
| author | Rickard Green <[email protected]> | 2019-03-04 17:45:46 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-04 17:45:46 +0100 |
| commit | 445e1e5825c63176112580c2724fb5510bd9bd8e (patch) | |
| tree | 7050d56706dc0a7dd329875968d4bc61315d8786 /lib | |
| parent | 3e52ed2a13a9cf56edac6d0635f18e348465a66e (diff) | |
| parent | b32a929bbb287c318f44cb0ecf17716c480f11ee (diff) | |
| download | otp-445e1e5825c63176112580c2724fb5510bd9bd8e.tar.gz otp-445e1e5825c63176112580c2724fb5510bd9bd8e.tar.bz2 otp-445e1e5825c63176112580c2724fb5510bd9bd8e.zip | |
Merge branch 'rickard/make-fixes-21/OTP-15551' into maint
* rickard/make-fixes-21/OTP-15551:
Fix install phase in build system
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/debugger/doc/src/Makefile | 3 | ||||
| -rw-r--r-- | lib/jinterface/doc/src/Makefile | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/debugger/doc/src/Makefile b/lib/debugger/doc/src/Makefile index 56d6085e9c..49b5a4be57 100644 --- a/lib/debugger/doc/src/Makefile +++ b/lib/debugger/doc/src/Makefile @@ -114,8 +114,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" - ($(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/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: |