From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 26 Dec 2020 08:08:37 +0000 (+0100)
Subject: Make: Fix build with tool chains that require depcomp
X-Git-Tag: v4.4.1~75
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=168db3b2484fcd818186fd784877cc5fc0624e95;ds=sidebyside

Make: Fix build with tool chains that require depcomp

Commit fad8e7f7b "Move auxiliary build tools to build-aux/" moved
depcomp, but neglected to adjust Make.mk.  This broke the build with
tool chains that actually use depcomp.  Modern GCC and Clang don't.
Fix the obvious way.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
---

diff --git a/Make.mk b/Make.mk
index e3e96e1e3..e809e376d 100644
--- a/Make.mk
+++ b/Make.mk
@@ -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',
@@ -72,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