summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-06-08 15:36:18 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-06-13 15:24:44 +0100
commit8229fe68b5d19c4aaf674474300319b5f69260b7 (patch)
tree59b62d719f52327935622e718f1aca6185341da4
parentace70aedcf8b29380a17f68a994b18f60976bca6 (diff)
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>
-rw-r--r--src/Makefile.am2
1 files changed, 1 insertions, 1 deletions
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