[stgt] [PATCH] Makefile: use 'rm -f' instead of rmdir

FUJITA Tomonori fujita.tomonori at lab.ntt.co.jp
Mon Apr 2 23:20:48 CEST 2012


On Mon, 2 Apr 2012 21:55:32 +0200
Arne Redlich <arne.redlich at googlemail.com> wrote:

> I'd suggest "-rm -f ..." - see
> http://www.gnu.org/software/make/manual/make.html#Errors

Thanks, I've merged the following:

-
>From 30c14631099c3f1effbf46c038611bd94e6f20b1 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Tue, 3 Apr 2012 06:16:45 +0900
Subject: [PATCH] Makefile: use '-rm -f' instead of rmdir

I got the following error when I do 'make clean' in a "already
cleaned" tree.

rmdir: failed to remove `manpages': No such file or directory
rmdir: failed to remove `htmlpages': No such file or directory
make[1]: *** [clean] Error 1

Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
---
 doc/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 4370fb2..f6352b3 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -30,7 +30,7 @@ install: $(MANPAGES) $(DOCS)
 .PHONY: clean
 clean:
 	rm -f $(XMLMAN) $(XMLHTML)
-	rmdir manpages htmlpages
+	-rm -f manpages htmlpages
 
 manpages/tgtd.8: tgtd.8.xml
 	-test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe stgt" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html



More information about the stgt mailing list