$NetBSD: patch-ab,v 1.2 2001/05/01 16:13:54 jtb Exp $

--- itcl/Makefile.in.orig	Tue Aug 29 03:58:00 2000
+++ itcl/Makefile.in
@@ -115,7 +115,7 @@
 
 SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@
 
-ITCL_LIBRARY = $(prefix)/lib/itcl$(VERSION)
+ITCL_LIBRARY = $(prefix)/lib/tcl/itcl$(VERSION)
 
 ITCL_GENERIC_DIR_NATIVE = @ITCL_GENERIC_DIR_NATIVE@
 ITCL_UNIX_DIR_NATIVE = @ITCL_UNIX_DIR_NATIVE@
@@ -150,16 +150,16 @@
 DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
-pkglibdir = $(libdir)/@PACKAGE@@VERSION@
+pkglibdir = $(libdir)/tcl/@PACKAGE@@VERSION@
 pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
 
 top_builddir = .
 
 #INSTALL = $(top_srcdir)/../config/install-sh -c
-INSTALL = $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/../config/installFile.tcl` -c
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL = ${LIBTOOL} --mode=install ${BSD_INSTALL}
+INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
+INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
+INSTALL_SCRIPT = ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT}
 INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
@@ -172,7 +172,7 @@
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
-CC = @CC@
+CC = ${LIBTOOL} --mode=compile @CC@
 CFLAGS_DEBUG = @CFLAGS_DEBUG@
 CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
 CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
@@ -187,9 +187,9 @@
 OBJEXT = @OBJEXT@
 RANLIB = @RANLIB@
 SHLIB_CFLAGS = @SHLIB_CFLAGS@
-SHLIB_LD = @SHLIB_LD@
+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
 SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
-SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
+SHLIB_LD_LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltcl83 -lm
 STLIB_LD = @STLIB_LD@
 TCL_BIN_DIR = @TCL_BIN_DIR@
 TCL_DEFS = @TCL_DEFS@
@@ -230,7 +230,7 @@
 AR = ar
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
+CCLD = ${LIBTOOL} --mode=link @CC@
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 
 #========================================================================
@@ -319,12 +319,10 @@
 $(itcl_LIB_FILE): $(itcl_OBJECTS)
 	-rm -f $(itcl_LIB_FILE)
 	@MAKE_LIB@
-	$(RANLIB) $(itcl_LIB_FILE)
 
 $(itclstub_LIB_FILE): $(itclstub_OBJECTS)
 	-rm -f $(itclstub_LIB_FILE)
 	@MAKE_STATIC_LIB@
-	$(RANLIB) $(itclstub_LIB_FILE)
 
 #========================================================================
 # We need to enumerate the list of .c to .o lines here.
@@ -420,7 +418,7 @@
 #========================================================================
 
 install-lib-binaries: installdirs
-	@list='$(lib_BINARIES)'; for p in $$list; do \
+	@list='${itcl_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \