aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc/tutorial/Makefile
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-04 16:32:09 +0100
committerRickard Green <[email protected]>2019-03-04 16:32:09 +0100
commitb32a929bbb287c318f44cb0ecf17716c480f11ee (patch)
treea972ffc586e100d6b1c9cbca287daba62b9ac067 /system/doc/tutorial/Makefile
parent934f9974eb6bec43cd9445ec0f5019a4d1389428 (diff)
parent2599dcfc973d30cfdf438d4587885eda154522ab (diff)
downloadotp-b32a929bbb287c318f44cb0ecf17716c480f11ee.tar.gz
otp-b32a929bbb287c318f44cb0ecf17716c480f11ee.tar.bz2
otp-b32a929bbb287c318f44cb0ecf17716c480f11ee.zip
Merge 'rickard/make-fixes-20/OTP-15551' into 'rickard/make-fixes-21/OTP-15551'
* rickard/make-fixes-20/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 'system/doc/tutorial/Makefile')
-rw-r--r--system/doc/tutorial/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/system/doc/tutorial/Makefile b/system/doc/tutorial/Makefile
index 5867096fc8..4c62deeffd 100644
--- a/system/doc/tutorial/Makefile
+++ b/system/doc/tutorial/Makefile
@@ -93,10 +93,9 @@ DVIPS_FLAGS +=
# ----------------------------------------------------
# Targets
# ----------------------------------------------------
-_create_dirs := $(shell mkdir -p $(HTMLDIR))
$(HTMLDIR)/%.gif: %.gif
- $(INSTALL_DATA) $< $@
+ $(CP) $< $@
docs: html
@@ -109,8 +108,8 @@ gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
debug opt:
clean clean_docs:
- rm -rf $(HTMLDIR)
- rm -rf $(XMLDIR)
+ rm -f $(XMLDIR)/*.xml
+ rm -f $(HTMLDIR)/*.gif $(HTMLDIR)/*.html
rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
rm -f errs core *~