From dd8921218b824dd2aa58d12a97c3443b8d40ceaf Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Tue, 17 Feb 2009 23:00:07 +0100
Subject: [PATCH] Fix make dist in a separate build directory without git,
 really

Make didn't remake sources.mk even though it was a phony target.  I
don't understand why.  But we can just as well create it in its only
user, dist-source.
---
 Make.mk | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/Make.mk b/Make.mk
index b64836d6..b189644c 100644
--- a/Make.mk
+++ b/Make.mk
@@ -143,7 +143,7 @@ $(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib)
 # Removed by distclean:
 distclean := $(ac) $(mk)
 # Distributed by dist-source from $(srcdir)
-src_distgen := $(acdist) sources.mk
+src_distgen := $(acdist)
 # Distributed by dist-client from $(srcdir)/src/client
 cli_distgen := $(acdistcli)
 
@@ -320,23 +320,14 @@ $(topics.html): info/emp2html.pl
 info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc)
 	groff $^ >$@
 
-# List of source files
-
-# Note: $(srcdir)/sources.mk is only included when the source tree
-# came from a tarball rather than git.  The following rule creates a
-# it only for putting it into the tarball.  It is not used otherwise
-# in this build.
-ifeq ($(revctrl),git)
-.PHONY: $(srcdir)/sources.mk
-$(srcdir)/sources.mk:
-	echo "src := $(src)" >$@
-endif
-
 # Distributing
 
 .PHONY: dist-source
 dist-source: $(src_distgen)
-	$(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src)
+ifeq ($(revctrl),git)
+	echo "src := $(src)" >$(srcdir)/sources.mk
+endif
+	$(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src) sources.mk
 
 .PHONY: dist-client
 dist-client: $(cli_distgen)