From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Barak A. Pearlmutter" Subject: [PATCH] Makefile robustness tweak Date: Mon, 30 May 2011 09:25:35 +0100 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([140.186.70.92]:36825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QQxnA-0003jQ-MY for emacs-orgmode@gnu.org; Mon, 30 May 2011 04:25:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QQxn9-0003mE-N6 for emacs-orgmode@gnu.org; Mon, 30 May 2011 04:25:40 -0400 Received: from lotus.nuim.ie ([149.157.1.189]:58059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QQxn9-0003m4-G3 for emacs-orgmode@gnu.org; Mon, 30 May 2011 04:25:39 -0400 Received: from localhost (localhost.test.com [127.0.0.1]) by lotus.nuim.ie (Postfix) with ESMTP id 2CE757DCD8A for ; Mon, 30 May 2011 09:25:36 +0100 (IST) Received: from mango.nuim.ie (banyan.nuim.ie [149.157.1.4]) by lotus.nuim.ie (Postfix) with ESMTP id 0921A7DC851 for ; Mon, 30 May 2011 09:25:36 +0100 (IST) Received: from port-kdr.hamilton.local ([149.157.192.251]) by mango.nuim.ie (Sun Java(tm) System Messaging Server 6.3-8.03 (built Apr 24 2009; 32bit)) with ESMTPS id <0LM0001R522N4H70@mango.nuim.ie> for emacs-orgmode@gnu.org; Mon, 30 May 2011 09:25:35 +0100 (IST) Received: from barak by port-kdr.hamilton.local with local (Exim 4.72) (envelope-from ) id 1QQxn5-0003eA-Qf for emacs-orgmode@gnu.org; Mon, 30 May 2011 09:25:35 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org >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 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 9693fd3..239ab2e 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 -- 1.7.2.5