X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/micropolis/blobdiff_plain/6a5fa4e03967ab980cdc7ef96a42400bc29b4414..HEAD:/src/tk/makefile

diff --git a/src/tk/makefile b/src/tk/makefile
index 344c37c..424f95b 100644
--- a/src/tk/makefile
+++ b/src/tk/makefile
@@ -29,11 +29,12 @@
 
 CC		= gcc
 
-CFLAGS		= -I. -I$(XINCLUDE) -I$(TCL_DIR) -O3 -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
-#CFLAGS		= -I. -I$(XINCLUDE) -I$(TCL_DIR) -g -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
+CFLAGS		= -I. -I$(XINCLUDE) -I$(TCL_DIR) -I$(TCLX_DIR) -O3 -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
+#CFLAGS		= -I. -I$(XINCLUDE) -I$(TCL_DIR) -I$(TCLX_DIR) -g -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
 
 TCL_DIR		= ../tcl
-XINCLUDE	= /usr/include/X11
+TCLX_DIR	= ../tclx/src
+XINCLUDE	= /usr/X11R6/include
 XLIB		= -L/usr/X11R6/lib -lX11 -lXpm
 
 LIBS = libtk.a $(TCL_DIR)/libtcl.a
@@ -175,7 +176,7 @@ libtk.a: $(OBJS)
 	ranlib libtk.a
 
 $(TCL_DIR)/libtcl.a:
-	cd $(TCL_DIR); make libtcl.a
+	cd $(TCL_DIR); $(MAKE) libtcl.a
 
 clean:
 	touch junk~