From ef4969c2ce2754c6ce535c9ac8d51ee3e7df1ea8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 10 Jun 2013 18:09:43 +0100
Subject: [PATCH] build: Fix 'make distclean' (again).

So it doesn't break after the generator has been deleted by
a previous distclean rule.
---
 subdir-rules.mk | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/subdir-rules.mk b/subdir-rules.mk
index d2ebe23ca..0de7b2882 100644
--- a/subdir-rules.mk
+++ b/subdir-rules.mk
@@ -26,5 +26,17 @@ include $(top_srcdir)/common-rules.mk
 $(generator_built): $(top_builddir)/generator/stamp-generator
 
 $(top_builddir)/generator/stamp-generator: $(top_builddir)/generator/generator
-	! test -f $(top_builddir)/generator/Makefile || \
-	  $(MAKE) -C $(top_builddir)/generator stamp-generator
+	@if test -f $(top_builddir)/generator/Makefile; then \
+	  $(MAKE) -C $(top_builddir)/generator stamp-generator; \
+	else \
+	  echo "warning: Run 'make' at the top level to build $(generator_built)"; \
+	fi
+
+# If this file doesn't exist, just print a warning and continue.
+# During 'make distclean' we can end up deleting this file.
+$(top_builddir)/generator/generator:
+	@if test -f $(top_builddir)/generator/Makefile; then \
+	  $(MAKE) -C $(top_builddir)/generator generator; \
+	else \
+	  echo "warning: Run 'make' at the top level to build $@"; \
+	fi