Fix make dist in a separate build directory without git, really

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index bbe1f09f56311aad3ba1acf0fa634024ebb2478b..b189644c957705c206150ac0f1524f068c31172f 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -1,6 +1,6 @@
 #
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
 #                            Ken Stevens, Steve McClure
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -47,7 +47,7 @@ all:
 
 # Source files
 ifeq ($(revctrl),git)
-src := $(shell cd $(srcdir) && git-ls-files)
+src := $(shell cd $(srcdir) && git ls-files)
 else
 include $(srcdir)/sources.mk
 endif
@@ -90,11 +90,7 @@ subst.in = sed \
 # See `Cleanliness' below
 mk := subjects.mk
 ifeq ($(revctrl),git)
-mk += sources.mk
-else
-ifneq ($(srcdir),.)
-mk += sources.mk
-endif
+mk += $(srcdir)/sources.mk
 endif
 # Generated by Autoconf, not distributed:
 ac := config.h config.log config.status info.html info.nr lib stamp-h
@@ -148,8 +144,6 @@ $(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib)
 distclean := $(ac) $(mk)
 # Distributed by dist-source from $(srcdir)
 src_distgen := $(acdist)
-# Distributed by dist-source from .
-bld_distgen := sources.mk
 # Distributed by dist-client from $(srcdir)/src/client
 cli_distgen := $(acdistcli)
 
@@ -326,29 +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 used when the source tree came
-# from a tarball rather than git.  The following rules create a
-# sources.mk to put into the tarball.  It is not used otherwise in
-# this build.
-
-ifeq ($(revctrl),git)
-.PHONY: sources.mk
-sources.mk:
-       echo "src := $(src)" >sources.mk
-else
-ifneq ($(srcdir),.)
-sources.mk: $(srcdir)/sources.mk
-       cp -f $^ $@
-endif
-endif
-
 # Distributing
 
 .PHONY: dist-source
-dist-source: $(src_distgen) $(bld_distgen)
-       $(tarball) $(TARNAME)-$(VERSION) $(bld_distgen) -C $(srcdir) $(src_distgen) $(src)
+dist-source: $(src_distgen)
+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)