From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [PATCH] Makefile robustness tweak Date: Tue, 31 May 2011 13:43:30 +0200 Message-ID: References: Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([140.186.70.92]:39375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRNMJ-0001f9-Id for emacs-orgmode@gnu.org; Tue, 31 May 2011 07:43:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QRNME-0007lF-P5 for emacs-orgmode@gnu.org; Tue, 31 May 2011 07:43:39 -0400 Received: from mail-ew0-f41.google.com ([209.85.215.41]:51965) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QRNME-0007l8-Id for emacs-orgmode@gnu.org; Tue, 31 May 2011 07:43:34 -0400 Received: by ewy9 with SMTP id 9so1754270ewy.0 for ; Tue, 31 May 2011 04:43:33 -0700 (PDT) In-Reply-To: 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: "Barak A. Pearlmutter" Cc: emacs-orgmode@gnu.org Applied, thanks. This was not coucht by the patchwork server - please make sure your next = patch is formatted properly and attached to the mail, that should do = it... - Carsten On May 30, 2011, at 10:25 AM, Barak A. Pearlmutter wrote: > =46rom 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 >=20 > --- > Makefile | 24 ++++++++++++------------ > 1 files changed, 12 insertions(+), 12 deletions(-) >=20 > 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 >=20 > doc/org: doc/org.texi > - (cd doc; $(MAKEINFO) --no-split org.texi -o org) > + (cd doc && $(MAKEINFO) --no-split org.texi -o org) >=20 > doc/org.pdf: doc/org.texi > - (cd doc; $(TEXI2PDF) org.texi) > + (cd doc && $(TEXI2PDF) org.texi) >=20 > doc/orgguide.pdf: doc/orgguide.texi > - (cd doc; $(TEXI2PDF) orgguide.texi) > + (cd doc && $(TEXI2PDF) orgguide.texi) >=20 > 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 >=20 > doc/orgcard.pdf: doc/orgcard.tex > - (cd doc; pdftex orgcard.tex) > + (cd doc && pdftex orgcard.tex) >=20 > 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) >=20 > doc/orgcard_letter.tex: doc/orgcard.tex > perl -pe 's/\\pdflayout=3D\(0l\)/\\pdflayout=3D(1l)/' \ > doc/orgcard.tex > doc/orgcard_letter.tex >=20 > doc/orgcard_letter.pdf: doc/orgcard_letter.tex > - (cd doc; pdftex orgcard_letter.tex) > + (cd doc && pdftex orgcard_letter.tex) >=20 > # Below here are special targets for maintenance only >=20 > @@ -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) >=20 > cleanrel: > rm -rf RELEASEDIR > --=20 > 1.7.2.5 >=20 >=20 - Carsten