aboutsummaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-04-16 16:37:41 +0200
committerErlang/OTP <[email protected]>2019-04-16 16:37:41 +0200
commitc231fd1d513272d144b3ba1d56930f74b15839d1 (patch)
tree2df77daa5ed0742dd219327050ab541e21c8d429 /system
parent6bc51edfd7efb409230c0ca1dffb7508e65687f9 (diff)
parent3d5876a20675a6987288afde6f9259a0758cb152 (diff)
downloadotp-c231fd1d513272d144b3ba1d56930f74b15839d1.tar.gz
otp-c231fd1d513272d144b3ba1d56930f74b15839d1.tar.bz2
otp-c231fd1d513272d144b3ba1d56930f74b15839d1.zip
Merge branch 'rickard/make-fixes-20/OTP-15657' into maint-20
* rickard/make-fixes-20/OTP-15657: Remove own configured RM make variable
Diffstat (limited to 'system')
-rw-r--r--system/doc/top/Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index 42309a0936..ff8b0c3cd6 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -246,12 +246,12 @@ html: $(INDEX_FILES) \
debug opt:
clean:
- $(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 *~
+ $(RM) ../html/js/*.js
+ $(RM) PR.template
+ $(RM) $(INDEX_FILES) $(MAN_INDEX)
+ $(RM) $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
+ $(RM) $(INDEX_SCRIPT) $(GLOSSARY_SCRIPT) $(JAVASCRIPT_BUILD_SCRIPT)
+ $(RM) erl_crash.dump errs core *~
# ----------------------------------------------------
# Release Target
@@ -275,7 +275,7 @@ release_docs_spec: docs
$(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
+ $(RM) -r $(RELSYSDIR)/temporary
release_spec: