dd5760000f
into a normal tcl interpreter, but did interfere with tcl-expat being loaded into apache mod_dtcl.
60 lines
1.6 KiB
Text
60 lines
1.6 KiB
Text
$NetBSD: patch-aa,v 1.2 2001/09/29 00:18:06 jwise Exp $
|
|
--- Makefile.orig Tue Aug 25 03:25:20 1998
|
|
+++ Makefile Fri Sep 28 18:57:36 2001
|
|
@@ -18,12 +18,12 @@
|
|
|
|
TCL_SHLIB_SUFFIX = .so
|
|
TCL_OBJS = tclexpat.o
|
|
-TCL_PREFIX = /usr/local/tcl/8.0
|
|
-TCL_EXEC_PREFIX = /usr/local/tcl/8.0
|
|
+TCL_PREFIX = ${LOCALBASE}
|
|
+TCL_EXEC_PREFIX = ${LOCALBASE}
|
|
TCL_SHLIB_CFLAGS = -fPIC
|
|
TCL_SHLIB_LD = gcc -shared
|
|
TCL_CC = gcc
|
|
-TCL_PACKAGE_PATH = /usr/local/tcl/8.0/lib
|
|
+TCL_PACKAGE_PATH = ${PREFIX}/lib/tcl
|
|
|
|
|
|
|
|
@@ -68,35 +68,23 @@
|
|
LIB= tclexpat$(TCL_SHLIB_SUFFIX)
|
|
|
|
|
|
-OBJS=expat/xmltok/xmltok.o \
|
|
- expat/xmltok/xmlrole.o \
|
|
- expat/xmlwf/xmlwf.o \
|
|
- expat/xmlwf/codepage.o \
|
|
- expat/xmlparse/xmlparse.o \
|
|
- expat/xmlparse/hashtable.o \
|
|
- $(FILEMAP_OBJ)
|
|
-
|
|
+OBJS=
|
|
|
|
all: $(LIB)
|
|
|
|
-
|
|
-$(LIB): tclexpat.o ${OBJS}
|
|
- $(TCL_SHLIB_LD) -o $(LIB) $(OBJS) tclexpat.o
|
|
-
|
|
-${OBJS}:
|
|
- cd expat ; make CC=${CC} SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
|
|
+$(LIB): tclexpat.o
|
|
+ $(TCL_SHLIB_LD) -o $(LIB) $(OBJS) tclexpat.o -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lexpat -ltcl83
|
|
|
|
tclexpat.o: tclexpat.c
|
|
- $(TCL_CC) $(CFLAGS) -c $(TCL_DEFS) $(TCL_SHLIB_CFLAGS) -I$(TCL_PREFIX)/include -Iexpat/xmlparse tclexpat.c
|
|
+ $(TCL_CC) $(CFLAGS) -c $(TCL_DEFS) $(TCL_SHLIB_CFLAGS) -I$(TCL_PREFIX)/include tclexpat.c
|
|
|
|
install: $(LIB)
|
|
instdir=`echo $(TCL_PACKAGE_PATH) | cut -f 1 -d :` ; \
|
|
mkdir $$instdir/TclExpat-$(TCLEXPAT_VERSION) ; \
|
|
- cp $(LIB) pkgIndex.tcl $$instdir
|
|
+ cp $(LIB) pkgIndex.tcl $$instdir/TclExpat-${TCLEXPAT_VERSION}
|
|
|
|
|
|
clean:
|
|
- @cd expat; make clean
|
|
rm -f *~ *.o
|
|
@if [ ! -z $(TCL_SHLIB_SUFFIX) ] ; then \
|
|
echo "rm -f *$(TCL_SHLIB_SUFFIX)" ;\
|