From: Emil Velikov <emil.velikov@collabora.com>
Date: Wed, 8 Jun 2016 14:36:18 +0000 (+0100)
Subject: automake: get in-tree `make distclean' working again.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8229fe68b5d19c4aaf674474300319b5f69260b7;p=mesa.git

automake: get in-tree `make distclean' working again.

With earlier commit we've handled the `make distclean' out of tree
build, yet we failed to attribute that for in-tree builds the test
condition will return 1. Thus effectively the target will be considered
as "failed".

Fixes: b7f7ec78435 ("mesa: automake: distclean git_sha1.h when building
OOT")
Cc: <mesa-stable@lists.freedesktop.org>
Tested-by: Andy Furniss <adf.lists@gmail.com>
Reported-by: Andy Furniss <adf.lists@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 0527a315955..32372da49c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ BUILT_SOURCES = git_sha1.h
 # At the same time `make distclean' gets angry at us if we don't cleanup the
 # builddir one.
 distclean-local:
-	test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h
+	( test $(top_srcdir) != $(top_builddir) && rm $(builddir)/git_sha1.h ) || true
 
 SUBDIRS = . gtest util mapi/glapi/gen mapi