From 8cc1c1936967653b706b271f505d7b2e8e823dc7 Mon Sep 17 00:00:00 2001 From: Andrey Miroshnikov Date: Fri, 15 Jul 2022 20:57:46 +0000 Subject: [PATCH] Not hardcoding tcl version and Debian detection --- distrib/share/etc/Linux.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/distrib/share/etc/Linux.mk b/distrib/share/etc/Linux.mk index e0ca79b..76a4eb9 100644 --- a/distrib/share/etc/Linux.mk +++ b/distrib/share/etc/Linux.mk @@ -81,10 +81,17 @@ CPLUSPLUS = /usr/bin/g++ CFLAGS = CPPFLAGS = +# tcl dir is a symlink to the current version (tcl8.6), better for future ifeq ($(findstring Ubuntu,$(shell uname -v)),Ubuntu) - CC += -I/usr/include/tcl8.5 - SCC += -I/usr/include/tcl8.5 - CPLUSPLUS += -I/usr/include/tcl8.5 + CC += -I/usr/include/tcl + SCC += -I/usr/include/tcl + CPLUSPLUS += -I/usr/include/tcl +endif + +ifeq ($(findstring Debian,$(shell uname -v)),Debian) + CC += -I/usr/include/tcl + SCC += -I/usr/include/tcl + CPLUSPLUS += -I/usr/include/tcl endif ifeq ($(PACKAGING_TOP),) -- 2.30.2