From: Ryan Schmidt <ryandesign@macports.org>
Date: Wed, 18 May 2022 10:53:08 +0000 (-0500)
Subject: src/tclx/tkucbsrc/makefile: Micropolis build fixes for recent macOS
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/micropolis/commitdiff_plain/939cf6655a6c04ceaf2902c863de9242ac9aece8?ds=sidebyside

src/tclx/tkucbsrc/makefile: Micropolis build fixes for recent macOS

Fix:
../../tk/tkconfig.h:55:10: fatal error: 'X11/Xlib.h' file not found
         ^~~~~~~~~~~~
---

diff --git a/src/tclx/config.mk b/src/tclx/config.mk
index 69ca791..6108fbe 100644
--- a/src/tclx/config.mk
+++ b/src/tclx/config.mk
@@ -54,6 +54,7 @@ TCL_TK_SHELL=wish
 TCL_TK_DIR=../tk
 TK_LIBRARY=/usr/local/lib/tk
 XPM_LIBS=-L/usr/X11R6/lib -lXpm 
+XINCLUDE=/usr/X11R6/include
 
 #------------------------------------------------------------------------------
 # Compiler debug/optimization/profiling flag to use.  Not that if debugging or
diff --git a/src/tclx/config/linux b/src/tclx/config/linux
index 12a800d..e83296f 100644
--- a/src/tclx/config/linux
+++ b/src/tclx/config/linux
@@ -9,5 +9,6 @@ LIBS=-lm
 RANLIB_CMD=ranlib
 MCS_CMD=true
 TCL_TK_LIBS= -L/usr/X11/lib -lX11 -lm -lXpm
+XINCLUDE=/usr/include/X11
 
 TCL_MAN_SEPARATOR=
diff --git a/src/tclx/tkucbsrc/makefile b/src/tclx/tkucbsrc/makefile
index 47f45f9..757ba45 100644
--- a/src/tclx/tkucbsrc/makefile
+++ b/src/tclx/tkucbsrc/makefile
@@ -24,7 +24,7 @@ SHELL=/bin/sh
 #------------------------------------------------------------------------------
 
 CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I../src -I../$(TCL_TK_DIR) \
-        -I../$(TCL_UCB_DIR) -I$(XHOME)/include \
+        -I../$(TCL_UCB_DIR) -I$(XINCLUDE) \
 	$(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS) \
         -DTK_VERSION=\"2.2/\"