From c1d91496221c3816863d258fc79660615e2e884a Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Wed, 9 Aug 2006 22:59:42 +0000
Subject: [PATCH] @@ -1,3 +1,10 @@ +chiark-tcl (1.0.1) unstable; urgency=low +
 +  * Replace #include <tcl8.3/tcl.h> with <tcl.h> and in build system find + 
   Tcl version and pass appropriate -I option.  (Closes: #362806.) + + -- + 
 chiark-tcl (1.0.0.99.iwj.2) unstable; urgency=low

   * Provide adns txt RRs.
---
 base/chiark-tcl.h | 4 +++-
 base/common.make  | 4 +++-
 debian/changelog  | 7 +++++++
 debian/rules      | 5 ++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/base/chiark-tcl.h b/base/chiark-tcl.h
index a8f399d..b28c2b1 100644
--- a/base/chiark-tcl.h
+++ b/base/chiark-tcl.h
@@ -31,7 +31,9 @@
 #include <sys/un.h>
 #include <arpa/inet.h>
 
-#include <tcl8.3/tcl.h>
+#ifndef _TCL /* if someone already included some tcl.h, use that */
+#include <tcl.h>
+#endif /*_TCL*/
 
 #include <adns.h>
 
diff --git a/base/common.make b/base/common.make
index d5db198..6e3852a 100644
--- a/base/common.make
+++ b/base/common.make
@@ -19,6 +19,8 @@
 
 VERSION ?=	1
 FAMILY ?=	chiark_tcl
+TCL_VERSION ?=	8.3
+TCL_INCLUDEDIR ?= /usr/include/tcl$(TCL_VERSION)
 
 OPTIMISE ?=		-O2
 TCL_MEM_DEBUG ?=	-DTCL_MEM_DEBUG
@@ -33,7 +35,7 @@ endif
 
 CFLAGS +=	-g -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror \
 		$(OPTIMISE)
-CPPFLAGS +=	-I$(BASE_DIR)
+CPPFLAGS +=	-I$(TCL_INCLUDEDIR) -I$(BASE_DIR)
 CPPFLAGS +=	$(TCL_MEM_DEBUG)
 
 AUTOS +=	$(AUTO_SRCS) $(AUTO_HDRS)
diff --git a/debian/changelog b/debian/changelog
index 3fc59f6..2ccb3cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-tcl (1.0.1) unstable; urgency=low
+
+  * Replace #include <tcl8.3/tcl.h> with <tcl.h> and in build system find
+    Tcl version and pass appropriate -I option.  (Closes: #362806.)
+
+ --
+
 chiark-tcl (1.0.0.99.iwj.2) unstable; urgency=low
 
   * Provide adns txt RRs.
diff --git a/debian/rules b/debian/rules
index 323a3f3..013cf52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,13 +25,16 @@ libpackage=libtcl-chiark-$(majversion)
 docpackage=libtcl-chiark-$(majversion)
 docdir=usr/share/doc/$(docpackage)
 
+tclh:=$(firstword $(wildcard /usr/include/tcl8.*/tcl.h))
+tclversion:=$(patsubst /usr/include/tcl%/tcl.h,%,$(tclh))
+
 define checkdir
 	test -f hbytes/hbytes.tct
 endef
 
 build:
 	$(checkdir)
-	$(MAKE) prefix=/usr VERSION=$(majversion)
+	$(MAKE) prefix=/usr VERSION=$(majversion) TCL_VERSION=$(tclversion)
 
 clean:
 	$(checkdir)
-- 
2.30.2