From bcf2f343c795c4968feace1f434be253d4661054 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 24 Apr 2018 20:21:24 +0100 Subject: [PATCH 1/1] Makefiles: Refer to $(BASE_DIR) rather than ../base/ Making out-of-tree extentions a bit easier. Signed-off-by: Ian Jackson --- base/extension.make | 2 +- debian/changelog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/base/extension.make b/base/extension.make index 0d63e4f..5cfc951 100644 --- a/base/extension.make +++ b/base/extension.make @@ -41,7 +41,7 @@ TCMDIFARGS ?= -p$(FAMILY)_$(EXTBASE) -o$@ $(BASE_TCT) $(OTHER_TCTS) $< %+tcmdif.h: %.tct $(BASE_TCT) $(OTHER_TCTS) $(TCMDIFGEN) $(TCMDIFGEN) -wh $(TCMDIFARGS) -OTHER_DIRS += ../base/ +OTHER_DIRS += $(BASE_DIR) OTHER_DIRS += $(addprefix ../,$(dir $(OTHER_EXTS))) OTHER_DIRS += . diff --git a/debian/changelog b/debian/changelog index 4dff38a..81af378 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ chiark-tcl (1.2.2~) unstable; urgency=medium * Turn on warnings and `use strict' and fix everything. * Replace deprecated `use IO;' with `use IO::File'. + Makefiles: + * Refer to $(BASE_DIR) rather than ../base/, making out-of-tree + extentions a bit easier. + -- chiark-tcl (1.2.1) unstable; urgency=high -- 2.30.2