Index: Makefile.in =================================================================== RCS file: /cvsroot/tclxml/tclxml/Makefile.in,v retrieving revision 1.19 diff -u -u -p -r1.19 Makefile.in --- Makefile.in 2 Nov 2002 00:21:42 -0000 1.19 +++ Makefile.in 26 Dec 2003 01:17:27 -0000 @@ -146,6 +146,7 @@ MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ MAKE_STUB_LIB = @MAKE_STUB_LIB@ OBJEXT = @OBJEXT@ RANLIB = @RANLIB@ +RANLIB_STUB = @RANLIB_STUB@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ @@ -169,6 +170,7 @@ TCL_LIBS = @TCL_LIBS@ EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ LD_LIBRARY_PATH="$(EXTRA_PATH):$(LD_LIBRARY_PATH)" \ + DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ LIBPATH="$(EXTRA_PATH):${LIBPATH}" \ SHLIB_PATH="$(EXTRA_PATH):${SHLIB_PATH}" \ PATH="$(EXTRA_PATH):$(PATH)" \ @@ -218,7 +220,7 @@ libraries: doc: -install: all install-binaries install-libraries install-doc +install: all install-binaries install-libraries install-binaries: binaries install-lib-binaries install-bin-binaries if test "x$(SHARED_BUILD)" = "x1"; then \ @@ -239,7 +241,7 @@ install-libraries: libraries @for p in $(GENERIC_SCRIPTS); do \ if test -f $$p; then \ echo "Installing $$p"; \ - $(INSTALL_DATA) $$p $(pkglibdir); \ + $(INSTALL_DATA) $$p $(DESTDIR)$(pkglibdir); \ else :; fi; \ done @echo "libraries done" @@ -290,7 +292,7 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJ $($(PACKAGE)stub_LIB_FILE): $($(PACKAGE)stub_OBJECTS) -rm -f $($(PACKAGE)stub_LIB_FILE) ${MAKE_STUB_LIB} - $(RANLIB) $($(PACKAGE)stub_LIB_FILE) + $(RANLIB_STUB) $($(PACKAGE)stub_LIB_FILE) #======================================================================== # We need to enumerate the list of .c to .o lines here. @@ -426,8 +428,14 @@ install-lib-binaries: if test -f $$p; then \ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \ + stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ + if test "x$$stub" = "xstub"; then \ + echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ + $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ + else \ echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ + fi; \ ext=`echo $$p|sed -e "s/.*\.//"`; \ if test "x$$ext" = "xdll"; then \ lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ Index: tclexpat.c =================================================================== RCS file: /cvsroot/tclxml/tclxml/tclexpat.c,v retrieving revision 1.15 diff -u -u -p -r1.15 tclexpat.c --- tclexpat.c 25 Feb 2003 04:09:00 -0000 1.15 +++ tclexpat.c 26 Dec 2003 01:17:27 -0000 @@ -866,7 +866,7 @@ static void TclExpatAttlistDeclHandler(u attdefnObj = Tcl_NewListObj(0, NULL); for (count = 0; (*attributes)[count] != NULL; count++) { - Tcl_ListObjAppendElement(expat->interp, attdefnObj, Tcl_NewStringObj(*attributes[count], -1)); + Tcl_ListObjAppendElement(expat->interp, attdefnObj, Tcl_NewStringObj((*attributes)[count], -1)); } TclXML_AttlistDeclHandler( Index: tclconfig/tcl.m4 =================================================================== RCS file: /cvsroot/tclxml/tclxml/tclconfig/tcl.m4,v retrieving revision 1.7 diff -u -u -p -r1.7 tcl.m4 --- tclconfig/tcl.m4 4 Apr 2003 22:03:14 -0000 1.7 +++ tclconfig/tcl.m4 26 Dec 2003 01:17:39 -0000 @@ -2591,6 +2591,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ # substituted. #-------------------------------------------------------------------- + RANLIB_STUB="${RANLIB}" if test "${TEA_PLATFORM}" = "windows" ; then if test "${SHARED_BUILD}" = "1" ; then # We force the unresolved linking of symbols that are really in @@ -2632,6 +2633,7 @@ AC_DEFUN(TEA_MAKE_LIB, [ AC_SUBST(MAKE_SHARED_LIB) AC_SUBST(MAKE_STATIC_LIB) AC_SUBST(MAKE_STUB_LIB) + AC_SUBST(RANLIB_STUB) ]) #------------------------------------------------------------------------