automake: get in-tree `make distclean' working again.
authorEmil Velikov <emil.velikov@collabora.com>
Wed, 8 Jun 2016 14:36:18 +0000 (15:36 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 13 Jun 2016 14:24:44 +0000 (15:24 +0100)
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>
src/Makefile.am

index 0527a315955412307145145d62bc5ae58ab2327c..32372da49c14600efdf4b3f2279f402390a96f61 100644 (file)
@@ -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