Index: xotcl/Makefile
===================================================================
diff -u -r0c17e1f4acbae0016b3f20cd4cc431d03d4ac999 -r894d9fdf1f31a1e18c1942007edebd85ebc5ae59
--- xotcl/Makefile	(.../Makefile)	(revision 0c17e1f4acbae0016b3f20cd4cc431d03d4ac999)
+++ xotcl/Makefile	(.../Makefile)	(revision 894d9fdf1f31a1e18c1942007edebd85ebc5ae59)
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: Makefile,v 1.7 2004/06/25 07:36:46 neumann Exp $
+# RCS: @(#) $Id: Makefile,v 1.8 2004/07/01 10:39:34 neumann Exp $
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
@@ -29,7 +29,7 @@
 src_generic_dir = ${srcdir}/generic
 PLATFORM_DIR    = $(srcdir)/unix
 TCL_LIB_SPEC    = -L/home/neumann/tcl8.4.5/unix -ltcl8.4
-TK_LIB_SPEC	= -L/usr/lib -ltk8.4
+TK_LIB_SPEC	= -L/usr/lib -ltk8.3
 subdirs		=  library/store/XOTclSdbm/ library/store/XOTclGdbm/ library/xml/TclExpat-1.1/
 
 libdirs = comm lib serialize actiweb rdf registry store xml patterns
@@ -101,10 +101,10 @@
 exec_prefix	= /usr
 
 bindir		= ${exec_prefix}/bin
-libdir		= ${exec_prefix}/lib
-datadir		= ${prefix}/share
+libdir		= /usr/lib
+datadir		= /usr/share
 mandir		= ${prefix}/man
-includedir	= ${prefix}/include
+includedir	= /usr/include
 
 DESTDIR		=
 
@@ -123,7 +123,7 @@
 PACKAGE_NAME	= xotcl
 PACKAGE_VERSION	= 1.2.1
 CC		= gcc -pipe
-CFLAGS_DEFAULT	= -O
+CFLAGS_DEFAULT	= -O -g
 CFLAGS_WARNING	= -Wall -Wconversion -Wno-implicit-int
 CLEANFILES	= *.o *.a *.so *~ core gmon.out config.*
 EXEEXT		= 
@@ -138,7 +138,7 @@
 SHLIB_CFLAGS	= -fPIC
 SHLIB_LD	= gcc -pipe -shared
 SHLIB_LD_FLAGS	= 
-SHLIB_LD_LIBS	= ${LIBS} -L/home/neumann/tcl8.4.5/unix -ltclstub8.4 -L/usr/lib -ltkstub8.4
+SHLIB_LD_LIBS	= ${LIBS} -L/home/neumann/tcl8.4.5/unix -ltclstub8.4 -L/usr/lib -ltkstub8.3
 STLIB_LD	= ${AR} cr
 TCL_DEFS	=  -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DTCL_THREADS=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DPEEK_XCLOSEIM=1 -DHAVE_SYS_IOCTL_H=1 
 TCL_BIN_DIR	= /home/neumann/tcl8.4.5/unix