From 6f873e16d6a1a8f6f59c1e5a75ec5f52ce5c89b6 Mon Sep 17 00:00:00 2001 From: Michael Gernoth Date: Sat, 4 Jun 2022 14:13:05 +0200 Subject: [PATCH] XINCLUDE: use /usr/X11R6/include everywhere As X11 includes live in /usr/include on linux the previous path was wrong anyway so switch to a path which should work on other systems (does not break linux). --- src/sim/makefile | 2 +- src/tclx/config/linux | 2 +- src/tk/makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sim/makefile b/src/sim/makefile index 3f29de7..afc440a 100644 --- a/src/sim/makefile +++ b/src/sim/makefile @@ -1,4 +1,4 @@ -XINCLUDE = /usr/include/X11 +XINCLUDE = /usr/X11R6/include TCLHOME = ../tcl TKHOME = ../tk TCLXHOME = ../tclx diff --git a/src/tclx/config/linux b/src/tclx/config/linux index e83296f..7188333 100644 --- a/src/tclx/config/linux +++ b/src/tclx/config/linux @@ -9,6 +9,6 @@ LIBS=-lm RANLIB_CMD=ranlib MCS_CMD=true TCL_TK_LIBS= -L/usr/X11/lib -lX11 -lm -lXpm -XINCLUDE=/usr/include/X11 +XINCLUDE=/usr/X11R6/include TCL_MAN_SEPARATOR= diff --git a/src/tk/makefile b/src/tk/makefile index 885b54a..424f95b 100644 --- a/src/tk/makefile +++ b/src/tk/makefile @@ -34,7 +34,7 @@ CFLAGS = -I. -I$(XINCLUDE) -I$(TCL_DIR) -I$(TCLX_DIR) -O3 -DTK_VERSION=\"2.3\" TCL_DIR = ../tcl TCLX_DIR = ../tclx/src -XINCLUDE = /usr/include/X11 +XINCLUDE = /usr/X11R6/include XLIB = -L/usr/X11R6/lib -lX11 -lXpm LIBS = libtk.a $(TCL_DIR)/libtcl.a -- 2.39.5