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).

diff --git a/src/sim/makefile b/src/sim/makefile
index 3f29de75539fbab2e3b1522b9fc84ed8b7a7ee73..afc440ab8c143b3727c26fe7a97f61cb26ffbb67 100644 (file)
--- 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
 TCLHOME = ../tcl
 TKHOME = ../tk
 TCLXHOME = ../tclx

diff --git a/src/tclx/config/linux b/src/tclx/config/linux
index e83296f66e84c0740111d6acafaf9829e98ddbe1..7188333d9306074a98b6c941dd35013c9a5d7b32 100644 (file)
--- 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
 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=
 
 TCL_MAN_SEPARATOR=

diff --git a/src/tk/makefile b/src/tk/makefile
index 885b54aa15264f7ecd67be07f459a0622094748a..424f95b5b13deed5b783f055e9bcbfd42f1aa737 100644 (file)
--- 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
 
 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
 XLIB           = -L/usr/X11R6/lib -lX11 -lXpm
 
 LIBS = libtk.a $(TCL_DIR)/libtcl.a