[Mesa-stable] [PATCH] automake: get in-tree `make distclean' working again.
Emil Velikov
emil.l.velikov at gmail.com
Wed Jun 8 14:44:39 UTC 2016
From: Emil Velikov <emil.velikov at collabora.com>
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 at lists.freedesktop.org>
Cc: Andy Furniss <adf.lists at gmail.com>
Reported-by: Andy Furniss <adf.lists at gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
Thanks for catching this Andy. The following seems to work fine here.
Can you give it a try on you end ?
Emil
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 0527a31..32372da 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
--
2.8.2
More information about the mesa-stable
mailing list