From 926b6163f1fd26c00b3f77da7838766647e26803 Mon Sep 17 00:00:00 2001 From: "Barak A. Pearlmutter" Date: Mon, 30 May 2011 09:25:35 +0100 Subject: [PATCH] Makefile robustness tweak From 7c79ea0a21ad6d2646958d25c298a1ac9624e9f6 Mon Sep 17 00:00:00 2001 From: Barak A. Pearlmutter Date: Sun, 29 May 2011 22:20:31 +0100 Subject: [PATCH] fail to rm or build incorrect files when doc directory nonexistent --- Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 9693fd3d9..239ab2ecc 100644 --- a/Makefile +++ b/Makefile @@ -238,30 +238,30 @@ lisp/org-install.el: $(LISPFILES0) Makefile mv org-install.el lisp doc/org: doc/org.texi - (cd doc; $(MAKEINFO) --no-split org.texi -o org) + (cd doc && $(MAKEINFO) --no-split org.texi -o org) doc/org.pdf: doc/org.texi - (cd doc; $(TEXI2PDF) org.texi) + (cd doc && $(TEXI2PDF) org.texi) doc/orgguide.pdf: doc/orgguide.texi - (cd doc; $(TEXI2PDF) orgguide.texi) + (cd doc && $(TEXI2PDF) orgguide.texi) doc/org.html: doc/org.texi - (cd doc; $(TEXI2HTML) --no-split -o org.html org.texi) + (cd doc && $(TEXI2HTML) --no-split -o org.html org.texi) UTILITIES/manfull.pl doc/org.html doc/orgcard.pdf: doc/orgcard.tex - (cd doc; pdftex orgcard.tex) + (cd doc && pdftex orgcard.tex) doc/orgcard.txt: doc/orgcard.tex - (cd doc; perl ../UTILITIES/orgcard2txt.pl orgcard.tex > orgcard.txt) + (cd doc && perl ../UTILITIES/orgcard2txt.pl orgcard.tex > orgcard.txt) doc/orgcard_letter.tex: doc/orgcard.tex perl -pe 's/\\pdflayout=\(0l\)/\\pdflayout=(1l)/' \ doc/orgcard.tex > doc/orgcard_letter.tex doc/orgcard_letter.pdf: doc/orgcard_letter.tex - (cd doc; pdftex orgcard_letter.tex) + (cd doc && pdftex orgcard_letter.tex) # Below here are special targets for maintenance only @@ -427,11 +427,11 @@ cleancontrib: cleanelc: rm -f $(ELCFILES) cleandoc: - (cd doc; rm -f org.pdf org org.html orgcard.pdf orgguide.pdf) - (cd doc; rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs) - (cd doc; rm -f *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps) - (cd doc; rm -f orgcard_letter.tex orgcard_letter.pdf) - (cd doc; rm -rf manual) + -(cd doc && rm -f org.pdf org org.html orgcard.pdf orgguide.pdf) + -(cd doc && rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs) + -(cd doc && rm -f *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps) + -(cd doc && rm -f orgcard_letter.tex orgcard_letter.pdf) + -(cd doc && rm -rf manual) cleanrel: rm -rf RELEASEDIR -- 2.11.4.GIT