Don't log out player when update aborts a command

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index 2d79ec3316450b210a801b0223014bd5acb9acf9..9c3fcb8c5390270a3552b7192a2b58407b64df4c 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
@@ -28,7 +28,7 @@
 #   Make.mk: The real Makefile, included by GNUmakefile
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2008
+#      Markus Armbruster, 2005-2009
 #
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -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)