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 69ca791309411682d321ee3625dd7d4dc330d4c0..6108fbe8f1d21a9a63dfb1b423acc6c648087d13 100644 (file)
--- 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 
 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
 
 #------------------------------------------------------------------------------
 # 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 12a800d2d7185fc4519e8db53a8473d914c877b9..e83296f66e84c0740111d6acafaf9829e98ddbe1 100644 (file)
--- 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
 RANLIB_CMD=ranlib
 MCS_CMD=true
 TCL_TK_LIBS= -L/usr/X11/lib -lX11 -lm -lXpm

+XINCLUDE=/usr/include/X11

 
 TCL_MAN_SEPARATOR=
 
 TCL_MAN_SEPARATOR=

diff --git a/src/tclx/tkucbsrc/makefile b/src/tclx/tkucbsrc/makefile
index 47f45f9329eae08ea1fca959e8dd7d3e04b80d1e..757ba45e01af54a5851d310105bc3306a1180216 100644 (file)
--- 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) \
 #------------------------------------------------------------------------------
 
 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/\"
 
        $(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS) \
         -DTK_VERSION=\"2.2/\"