From: Jim Meyering <meyering@redhat.com>
Date: Wed, 26 Mar 2008 00:03:01 +0000 (+0100)
Subject: gnumakefile: remove file from $(top_builddir), not from $(top_srcdir)
X-Git-Tag: v0.1~7640
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=2aa756014eebc4ffa93b8d3e754564236ffb0d23;p=gnulib.git

gnumakefile: remove file from $(top_builddir), not from $(top_srcdir)

* modules/gnumakefile (clean-GNUmakefile): Also, use
test ... && ... || : syntax rather than if-then ... fi.

Signed-off-by: Jim Meyering <meyering@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index ced73b057..a391159f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 
 2008-03-26  Jim Meyering  <meyering@redhat.com>
 
+	gnumakefile: remove file from $(top_builddir), not from $(top_srcdir)
+	* modules/gnumakefile (clean-GNUmakefile): Also, use
+	test ... && ... || : syntax rather than if-then ... fi.
+
 	gnumakefile: Don't double-quote-expand $(VPATH) value.
 	* modules/gnumakefile (clean-GNUmakefile): Use single quotes.
 
diff --git a/modules/gnumakefile b/modules/gnumakefile
index 85597708e..483ff74dd 100644
--- a/modules/gnumakefile
+++ b/modules/gnumakefile
@@ -21,7 +21,7 @@ m4_if(m4_version_compare([2.61a.100],
 Makefile.am:
 distclean-local: clean-GNUmakefile
 clean-GNUmakefile:
-	if test x'$(VPATH)' != x ; then rm -f $(top_srcdir)/GNUmakefile ; fi
+	test x'$(VPATH)' != x && rm -f $(top_builddir)/GNUmakefile || :
 
 Include: