X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=Make.mk;h=e809e376dc2e6ada793536eece2a0cd9eee0b0ef;hp=b08596470c682b07bbf0c8d808bea73e5d92f810;hb=54b1e7e167fd594d39ff91fd78e34cb8b411162b;hpb=ece998e06458c09358da361bb0c516de8b9228ce

diff --git a/Make.mk b/Make.mk
index b08596470..e809e376d 100644
--- a/Make.mk
+++ b/Make.mk
@@ -1,6 +1,6 @@
 #
 #   Empire - A multi-player, client/server Internet based war game.
-#   Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
+#   Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
 #                 Ken Stevens, Steve McClure, Markus Armbruster
 #
 #   Empire is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 #   Make.mk: The real Makefile, included by GNUmakefile
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2017
+#      Markus Armbruster, 2005-2020
 #
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -48,12 +48,16 @@ all:
 ifeq ($(revctrl),git)
 src := $(shell cd $(srcdir) && git ls-files | uniq)
 version := $(shell cd $(srcdir) && build-aux/git-version-gen /dev/null)
+ifeq ($(version),UNKNOWN)
+$(warning cannot figure out version number, falling back to git hash)
+version := UNKNOWN-$(shell cd $(srcdir) && git-rev-parse --verify --short HEAD || echo "UNKNOWN")
+endif
 else
 include $(srcdir)/sources.mk
 version := $(shell cat $(srcdir)/.tarball-version || echo "UNKNOWN")
 endif
 ifeq ($(version),UNKNOWN)
-$(error cannot figure out version)
+$(error cannot figure out version number)
 endif
 dirs := $(sort $(dir $(src)))
 csrc := $(filter %.c, $(src))
@@ -68,7 +72,7 @@ include $(srcdir)/info/subjects.mk
 topics := $(patsubst %.t,%,$(notdir $(tsrc)))
 info := $(topics) $(subjects) all TOP
 scripts := $(srcdir)/src/scripts
-depcomp := $(SHELL) $(srcdir)/depcomp
+depcomp := $(SHELL) $(srcdir)/build-aux/depcomp
 tarball := $(SHELL) -e $(scripts)/tarball
 econfig := $(sysconfdir)/empire/econfig
 schedule := $(sysconfdir)/empire/schedule
@@ -256,6 +260,7 @@ ifeq ($(empthread),LWP)
 	$(srcdir)/tests/smoke-test $(srcdir)
 	$(srcdir)/tests/actofgod-test $(srcdir)
 	$(srcdir)/tests/build-test $(srcdir)
+	$(srcdir)/tests/load-tend-test $(srcdir)
 	$(srcdir)/tests/navi-march-test $(srcdir)
 	$(srcdir)/tests/fire-test $(srcdir)
 	$(srcdir)/tests/torpedo-test $(srcdir)
@@ -267,6 +272,7 @@ else
 	@echo "$(srcdir)/tests/smoke-test SKIPPED"
 	@echo "$(srcdir)/tests/actofgod-test SKIPPED"
 	@echo "$(srcdir)/tests/build-test SKIPPED"
+	@echo "$(srcdir)/tests/load-tend-test SKIPPED"
 	@echo "$(srcdir)/tests/navi-march-test SKIPPED"
 	@echo "$(srcdir)/tests/fire-test SKIPPED"
 	@echo "$(srcdir)/tests/torpedo-test SKIPPED"