Index: xotcl/Makefile
===================================================================
diff -u -r19ca82711d9d349fed79fa63af7529833aa9885d -r2c6cdd4f5d1c45c96e996a70b54ae4c5f46a40fd
--- xotcl/Makefile	(.../Makefile)	(revision 19ca82711d9d349fed79fa63af7529833aa9885d)
+++ xotcl/Makefile	(.../Makefile)	(revision 2c6cdd4f5d1c45c96e996a70b54ae4c5f46a40fd)
@@ -12,14 +12,14 @@
 # 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.21 2004/10/09 22:34:36 neumann Exp $
+# RCS: @(#) $Id: Makefile,v 1.22 2004/10/30 20:19:55 neumann Exp $
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
 # have been added in a customized configure script.
 #========================================================================
 
-#XOTCL_VERSION 	= 1.3.1
+#XOTCL_VERSION 	= 1.3.3
 XOTCL_VERSION 	= 1.3
 
 src_lib_dir 	= ${srcdir}/library
@@ -32,6 +32,7 @@
 TCL_LIB_SPEC    = -L/home/neumann/import/tcl8.4.7/unix -ltcl8.4
 TK_LIB_SPEC	= -L/usr/lib -ltk8.4
 subdirs		=  library/store/XOTclSdbm/ library/store/XOTclGdbm/ library/xml/TclExpat-1.1/
+aol_prefix	= /usr/local/aolserver
 
 libdirs = comm lib serialize actiweb rdf registry store xml patterns
 libsrc 	= COPYRIGHT pkgIndex.tcl 
@@ -89,8 +90,8 @@
 # configuration options) composed of the named objects.
 #========================================================================
 
-PKG_LIB_FILE	= libxotcl1.3.1.so
-PKG_STUB_LIB_FILE = libxotclstub1.3.1.a
+PKG_LIB_FILE	= libxotcl1.3.3.so
+PKG_STUB_LIB_FILE = libxotclstub1.3.3.a
 
 lib_BINARIES	= $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE)
 BINARIES	= $(lib_BINARIES)
@@ -117,7 +118,7 @@
 INSTALL_SCRIPT	= ${INSTALL}
 
 PACKAGE_NAME	= xotcl
-PACKAGE_VERSION	= 1.3.1
+PACKAGE_VERSION	= 1.3.3
 CC		= gcc -pipe
 CFLAGS_DEFAULT	= -O
 CFLAGS_WARNING	= -Wall -Wconversion -Wno-implicit-int
@@ -144,9 +145,9 @@
 # Not used, but retained for reference of what libs Tcl required
 TCL_LIBS	= ${DL_LIBS} ${LIBS} ${MATH_LIBS}
 
-pkgdatadir	= /usr/share/xotcl1.3.1
-pkglibdir	= /usr/lib/xotcl1.3.1
-pkgincludedir	= /usr/include/xotcl1.3.1
+pkgdatadir	= /usr/share/xotcl1.3.3
+pkglibdir	= /usr/lib/xotcl1.3.3
+pkgincludedir	= /usr/include/xotcl1.3.3
 
 #========================================================================
 # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
@@ -165,15 +166,15 @@
 SHARED_BUILD	= 1
 
 INCLUDES	=  -I$(TCL_SRC_DIR)/generic -I$(TCL_SRC_DIR)/unix -I./generic
-EXTRA_CFLAGS	=   -DXOTCLVERSION=\"1.3\" -DXOTCLPATCHLEVEL=\".1\" 	 -DHAVE_TCL_COMPILE_H=1
+EXTRA_CFLAGS	=   -DXOTCLVERSION=\"1.3\" -DXOTCLPATCHLEVEL=\".3\" 	 -DHAVE_TCL_COMPILE_H=1
 
 # TCL_DEFS is not strictly need here, but if you remove it, then you
 # must make sure that configure.in checks for the necessary components
 # that your library may use.  TCL_DEFS can actually be a problem if
 # you do not compile with a similar machine setup as the Tcl core was
 # compiled with.
-#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.3.1\" -DPACKAGE_STRING=\"xotcl\ 1.3.1\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS)
-DEFS		= -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.3.1\" -DPACKAGE_STRING=\"xotcl\ 1.3.1\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS) 
+#DEFS		= $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.3.3\" -DPACKAGE_STRING=\"xotcl\ 1.3.3\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS)
+DEFS		= -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.3.3\" -DPACKAGE_STRING=\"xotcl\ 1.3.3\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_STRUCT_STAT64=1 -DHAVE_TYPE_OFF64_T=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_READDIR_R=1 -DTCL_THREADS=1 -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1  $(EXTRA_CFLAGS) 
 
 CONFIG_CLEAN_FILES = Makefile xotclConfig.sh apps/utils/xotclsh apps/utils/xowish unix/xotcl.spec unix/pkgIndex.unix autom4te.cache/
 
@@ -242,7 +243,7 @@
 
 install-aol: install-binaries install-libraries
 	$(INSTALL) $(src_generic_dir)/aol-xotcl.tcl \
-		$(DESTDIR)/usr/local/aolserver/modules/tcl/xotcl.tcl
+		$(DESTDIR)/$(aol_prefix)/modules/tcl/xotcl.tcl
 
 
 #========================================================================
@@ -612,6 +613,7 @@
 bin-tar: 
 	(cd ..; tar zcvf xotcl-$(PACKAGE_VERSION)-bin-linux-i686-glibc.tar.gz \
                 `find $(exec_prefix)/bin/xotclsh $(exec_prefix)/bin/xowish \
+                  $(prefix)/lib/xotcl* \
 		  $(prefix)/include/xotcl*.h \
                   $(DESTDIR)$(pkglibdir) $(prefix)/man/man1/xo* \
                 -type f -o -type l | fgrep -v CVS | fgrep -v SCCS | fgrep -v .junk| fgrep -v .db | fgrep -v "~" | fgrep -v "#" | fgrep -v /receiver/` \