Index: Makefile.in
===================================================================
RCS file: /usr/local/pubcvs/tdom/Makefile.in,v
retrieving revision 1.19
diff -u -u -p -r1.19 Makefile.in
--- Makefile.in	30 Dec 2003 19:19:47 -0000	1.19
+++ Makefile.in	3 Feb 2004 17:00:26 -0000
@@ -156,6 +156,7 @@ MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
 MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
 OBJEXT		= @OBJEXT@
 RANLIB		= @RANLIB@
+RANLIB_STUB	= @RANLIB_STUB@
 SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_LD	= @SHLIB_LD@
 SHLIB_LDFLAGS	= @SHLIB_LDFLAGS@
@@ -192,6 +193,7 @@ TDOM_LD_SEARCH_FLAGS = @TDOM_LD_SEARCH_F
 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)" \
@@ -324,7 +326,7 @@ depend:
 $($(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)
 
 $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJECTS)
 	-rm -f $($(PACKAGE)_LIB_FILE)
@@ -444,8 +446,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: configure.in
===================================================================
RCS file: /usr/local/pubcvs/tdom/configure.in,v
retrieving revision 1.19
diff -u -u -p -r1.19 configure.in
--- configure.in	14 Sep 2003 11:18:58 -0000	1.19
+++ configure.in	3 Feb 2004 17:00:26 -0000
@@ -210,9 +210,9 @@ AC_SUBST(tdom_SRC_DIR)
 stublib="-ltdomstub${VERSION}${TCL_DBGX}"
 
 if test "${TEA_PLATFORM}" = "windows" ; then
-    tdomstub_BUILD_SPEC="-L${tdom_SRC_DIR}/win ${stublib}"
+    tdomstub_BUILD_SPEC="-L`pwd` ${stublib}"
 elif test "${TEA_PLATFORM}" = "unix" ; then
-    tdomstub_BUILD_SPEC="-L${tdom_SRC_DIR}/unix ${stublib}"
+    tdomstub_BUILD_SPEC="-L`pwd` ${stublib}"
 else
     error "unsupported TEA platform: ${TEA_PLATFORM}"
 fi
Index: extensions/tnc/Makefile.in
===================================================================
RCS file: /usr/local/pubcvs/tdom/extensions/tnc/Makefile.in,v
retrieving revision 1.4
diff -u -u -p -r1.4 Makefile.in
--- extensions/tnc/Makefile.in	10 Oct 2003 20:04:24 -0000	1.4
+++ extensions/tnc/Makefile.in	3 Feb 2004 17:00:26 -0000
@@ -284,7 +284,7 @@ $($(PACKAGE)_LIB_FILE): $($(PACKAGE)_OBJ
 # As necessary, add $(srcdir):$(srcdir)/compat:....
 #========================================================================
 
-VPATH = $(srcdir)/generic:$(srcdir)/expat:$(srcdir)/unix:$(srcdir)/win
+VPATH = $(srcdir)
 
 .c.$(OBJEXT):
 	$(COMPILE) -c `@CYGPATH@ $<` -o $@
Index: extensions/tnc/configure.in
===================================================================
RCS file: /usr/local/pubcvs/tdom/extensions/tnc/configure.in,v
retrieving revision 1.3
diff -u -u -p -r1.3 configure.in
--- extensions/tnc/configure.in	22 Feb 2003 21:06:50 -0000	1.3
+++ extensions/tnc/configure.in	3 Feb 2004 17:00:27 -0000
@@ -72,11 +72,8 @@ TEA_LOAD_TCLCONFIG
 #--------------------------------------------------------------------
 # Load the tdomConfig.sh file
 #--------------------------------------------------------------------
-if test "${TEA_PLATFORM}" = "windows" ; then
-    TDOM_BIN_DIR=../../win
-else
-    TDOM_BIN_DIR=../../unix
-fi
+
+TDOM_PATH_CONFIG
 TDOM_LOAD_CONFIG
 
 #--------------------------------------------------------------------
Index: tclconfig/tcl.m4
===================================================================
RCS file: /usr/local/pubcvs/tdom/tclconfig/tcl.m4,v
retrieving revision 1.3
diff -u -u -p -r1.3 tcl.m4
--- tclconfig/tcl.m4	14 Sep 2003 11:08:14 -0000	1.3
+++ tclconfig/tcl.m4	3 Feb 2004 17:00:27 -0000
@@ -2670,6 +2670,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
@@ -2711,6 +2712,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)
 ])
 
 #------------------------------------------------------------------------