Subject: Re: lang/tcl, lang/tcl83 build failure on MacOS X
To: John D. Baker <jdbaker@mylinuxisp.com>
From: Dan Winship <danw@NetBSD.org>
List: tech-pkg
Date: 04/07/2004 21:38:10
--Apple-Mail-5-1875728
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
On Apr 6, 2004, at 6:00 PM, John D. Baker wrote:
> Tcl (8.4.6) and/or tcl83 (8.3.4) fail to build on MacOS X 10.1.5 and
> 10.2.8 as follows:
The attached patches fix the build on OS X, and don't break it on
NetBSD. I don't have any other platforms to test it on. Do we know what
platforms it's currently known to work on? (jwise, ok to commit?)
(The patches make it (1) not use libtool to build static libraries, (2)
fix the assumption that the shared library name ends in ".so", as well
as fixing up the Makefile dependencies so it doesn't end up trying to
rebuild things at install time, and (3) deal with the fact that the
installed libs have a different name on some OSes, including OS X.)
-- Dan
--Apple-Mail-5-1875728
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
x-unix-mode=0644;
name="tcl.diff.txt"
Content-Disposition: attachment;
filename=tcl.diff.txt
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile 25 Mar 2004 22:49:14 -0000 1.30
+++ Makefile 8 Apr 2004 00:59:08 -0000
@@ -25,7 +25,7 @@
INSTALL_TARGET= install
-PLIST_SUBST+= SHLIB_SUFX="${SHLIB_SUFX}"
+PLIST_SUBST+= DOT=${DOT}
# Initially install the man pages into ${WRKDIR}/man, as we need a staged
# install to avoid overwriting existing manpages in ${PREFIX}/man.
@@ -39,11 +39,7 @@
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
-PLIST_SUBST+= SHLIB_CMT="@comment "
-SHLIB_SUFX= dylib
-.else
-PLIST_SUBST+= SHLIB_CMT=""
-SHLIB_SUFX= la
+DOT= "."
.endif
# NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
@@ -71,13 +67,6 @@
${RM} -f mkLinks.tmp; \
${CHMOD} +x mkLinks;
-pre-install:
- cd ${WRKSRC}; for file in \
- tclUnixInit.o libtcl84.so tclsh; \
- do \
- ${TOUCH} $${file}; \
- done
-
post-install:
cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
${RM} -rf ${WRKDIR}/man
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST 8 Mar 2004 19:55:35 -0000 1.4
+++ PLIST 8 Apr 2004 00:59:09 -0000
@@ -17,12 +17,12 @@
include/tcl/unix/tclUnixPort.h
include/tclDecls.h
include/tclPlatDecls.h
-${SHLIB_CMT}lib/libtcl84.a
-lib/libtcl84.${SHLIB_SUFX}
-lib/libtcl84.so
-lib/libtcl84.so.1
-lib/libtcl84.so.1.0
-lib/libtclstub84.a
+lib/libtcl8${DOT}4.a
+lib/libtcl8${DOT}4.la
+lib/libtcl8${DOT}4.so
+lib/libtcl8${DOT}4.so.1
+lib/libtcl8${DOT}4.so.1.0
+lib/libtclstub8${DOT}4.a
lib/tcl8.4/auto.tcl
lib/tcl8.4/encoding/ascii.enc
lib/tcl8.4/encoding/big5.enc
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo 25 Mar 2004 22:49:14 -0000 1.21
+++ distinfo 8 Apr 2004 00:59:09 -0000
@@ -2,8 +2,8 @@
SHA1 (tcl8.4.6-src.tar.gz) = d21495ca04419fc3b1594b96b19116040c33a3f0
Size (tcl8.4.6-src.tar.gz) = 3448711 bytes
-SHA1 (patch-aa) = 5a8d4d6a14c3520cb9f46e65d826ee85f48b2c5b
-SHA1 (patch-ab) = 3032c2b97e69260827f9fec27553557572b9bdb4
+SHA1 (patch-aa) = c23a611dd51dd030f6c77578eb455aa3d63d5c08
+SHA1 (patch-ab) = 13340fe1e754fab93784021540461dc3115cd76c
SHA1 (patch-ac) = efc40f45f73cec2770231ff515314fc41bbd166e
SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3
SHA1 (patch-af) = 164fa9ee7fe4baa9b3f3a13716aefbf415e3be0a
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/patches/patch-aa,v
retrieving revision 1.10
diff -u -r1.10 patch-aa
--- patches/patch-aa 25 Mar 2004 22:49:14 -0000 1.10
+++ patches/patch-aa 8 Apr 2004 00:59:10 -0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2004/03/25 22:49:14 jlam Exp $
+$NetBSD$
--- Makefile.in.orig Mon Mar 1 18:58:59 2004
+++ Makefile.in
@@ -22,18 +22,24 @@
INSTALL_LIBRARY = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
-@@ -190,8 +190,8 @@ TCL_EXE = tclsh
- # configure script. You shouldn't normally need to modify any of
+@@ -191,7 +191,7 @@ TCL_EXE = tclsh
# these definitions by hand.
--STLIB_LD = @STLIB_LD@
+ STLIB_LD = @STLIB_LD@
-SHLIB_LD = @SHLIB_LD@
-+STLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
-@@ -254,8 +254,9 @@ DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest
+@@ -217,6 +217,7 @@ BUILD_DLTEST = @BUILD_DLTEST@
+ #BUILD_DLTEST =
+
+ TCL_LIB_FILE = @TCL_LIB_FILE@
++TCL_LA_FILE = ${TCL_LIB_FILE:C/@SHLIB_SUFFIX@/.la/}
+ #TCL_LIB_FILE = libtcl.a
+
+ # Generic lib name used in rules that apply to tcl and tk
+@@ -254,8 +255,9 @@ DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest
# Must be absolute to so the corresponding tcltest's tcl_library is absolute.
TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library
@@ -44,16 +50,41 @@
# Flags to be passed to mkLinks to control whether the manpages
# should be compressed and linked with softlinks
-@@ -474,7 +475,7 @@ objs: ${OBJS}
+@@ -445,7 +447,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
+
+ all: binaries libraries doc
+
+-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
++binaries: ${TCL_LA_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
+
+ libraries:
+@@ -453,7 +455,7 @@ doc:
- tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+ # The following target is configured by autoconf to generate either
+ # a shared library or non-shared library for Tcl.
+-${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
++${TCL_LA_FILE}: ${OBJS} ${STUB_LIB_FILE}
+ rm -f $@
+ @MAKE_LIB@
+
+@@ -473,8 +475,8 @@ tclLibObjs:
+ objs: ${OBJS}
+
+
+-tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
- ${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE}
+ ${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
${CC_SEARCH_FLAGS} -o tclsh
# Resetting the LIB_RUNTIME_DIR below is required so that
-@@ -486,7 +487,7 @@ tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE}
+@@ -482,11 +484,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+ # burned into its ld search path. This keeps tcltest from
+ # picking up an already installed version of the Tcl library.
+
+-tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
++tcltest: ${TCLTEST_OBJS} ${TCL_LA_FILE} ${BUILD_DLTEST}
$(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
tcltest-real:
@@ -62,7 +93,7 @@
${CC_SEARCH_FLAGS} -o tcltest
# Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -1054,7 +1055,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
+@@ -1054,7 +1056,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
@DL_OBJS@ ${BUILD_DLTEST}
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/patches/patch-ab,v
retrieving revision 1.24
diff -u -r1.24 patch-ab
--- patches/patch-ab 25 Mar 2004 22:49:14 -0000 1.24
+++ patches/patch-ab 8 Apr 2004 00:59:11 -0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
+$NetBSD$
--- configure.orig Mon Mar 1 18:58:59 2004
+++ configure
@@ -492,24 +492,11 @@
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
- MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
-+ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
-+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
++ MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++ INSTALL_LIB='$(INSTALL_LIBRARY) $(TCL_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -6915,10 +6941,10 @@ fi
-
- # Stub lib does not depend on shared/static configuration
- if test "$RANLIB" = "" ; then
-- MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS}'
-+ MAKE_STUB_LIB='${STLIB_LD} -o $@ ${STUB_LIB_OBJS}'
- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)'
- else
-- MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
-+ MAKE_STUB_LIB='${STLIB_LD} -o $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
- INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
- fi
-
@@ -7217,7 +7243,7 @@ elif test "$SHARED_BUILD" = "0" || test
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
--Apple-Mail-5-1875728
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
x-unix-mode=0644;
name="tk.diff.txt"
Content-Disposition: attachment;
filename=tk.diff.txt
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tk/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile 25 Mar 2004 22:49:15 -0000 1.32
+++ Makefile 8 Apr 2004 01:01:26 -0000
@@ -28,6 +28,14 @@
#
CONFIGURE_ARGS+= --mandir=${WRKDIR}/man
+PLIST_SUBST+= DOT=${DOT}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+DOT= "."
+.endif
+
.include "../../lang/tcl/buildlink3.mk"
# Modify mkLinks script to remove the short-filename manpage if it was
@@ -46,13 +54,6 @@
${RM} -f mkLinks.tmp; \
${CHMOD} +x mkLinks;
-pre-install:
- cd ${WRKSRC}; for file in \
- tkUnixInit.o libtk84.so wish; \
- do \
- ${TOUCH} $${file}; \
- done
-
post-install:
cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
${RM} -rf ${WRKDIR}/man
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tk/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST 8 Mar 2004 22:14:19 -0000 1.4
+++ PLIST 8 Apr 2004 01:01:29 -0000
@@ -31,12 +31,12 @@
include/tk/unix/tkUnixPort.h
include/tkDecls.h
include/tkPlatDecls.h
-lib/libtk84.a
-lib/libtk84.la
-lib/libtk84.so
-lib/libtk84.so.1
-lib/libtk84.so.1.0
-lib/libtkstub84.a
+lib/libtk8${DOT}4.a
+lib/libtk8${DOT}4.la
+lib/libtk8${DOT}4.so
+lib/libtk8${DOT}4.so.1
+lib/libtk8${DOT}4.so.1.0
+lib/libtkstub8${DOT}4.a
lib/tk8.4/bgerror.tcl
lib/tk8.4/button.tcl
lib/tk8.4/choosedir.tcl
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tk/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo 25 Mar 2004 22:49:15 -0000 1.15
+++ distinfo 8 Apr 2004 01:01:29 -0000
@@ -2,7 +2,7 @@
SHA1 (tk8.4.6-src.tar.gz) = a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88
Size (tk8.4.6-src.tar.gz) = 3230760 bytes
-SHA1 (patch-aa) = 8d5ef8ca0667c1cec570b8b661d3c3cabf0c44e1
-SHA1 (patch-ab) = a64ea12d46f1e5a7893ac7489c0815f7e1f6fabb
+SHA1 (patch-aa) = 60fd440a16607a9000fd16b1a6f6461d2d717fdd
+SHA1 (patch-ab) = b69f6168614955d9c5639dbc8352d5180ca752d2
SHA1 (patch-ac) = 055e64d4a3a1e93f6e122ebdad270fb1490fe381
SHA1 (patch-ad) = 2f65cb36160794991d940bb3ffc9a754dcd9febc
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tk/patches/patch-aa,v
retrieving revision 1.10
diff -u -r1.10 patch-aa
--- patches/patch-aa 25 Mar 2004 22:49:15 -0000 1.10
+++ patches/patch-aa 8 Apr 2004 01:01:29 -0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $
+$NetBSD$
--- Makefile.in.orig Mon Mar 1 19:04:48 2004
+++ Makefile.in
@@ -31,7 +31,15 @@
INSTALL_LIBRARY = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
-@@ -234,7 +234,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
+@@ -208,6 +208,7 @@ TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@
+ #TK_STUB_LIB_FLAG = -ltkstub
+
+ TK_LIB_FILE = @TK_LIB_FILE@
++TK_LA_FILE = ${TK_LIB_FILE:C/@SHLIB_SUFFIX@/.la/}
+ #TK_LIB_FILE = libtk.a
+
+ # Generic lib name used in rules that apply to tcl and tk
+@@ -234,7 +235,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
# The values of the symbolis normally set by the configure script.
STLIB_LD = @STLIB_LD@
@@ -40,7 +48,7 @@
SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS@
-@@ -274,7 +274,8 @@ TOOL_DIR = @TCL_SRC_DIR@/tools
+@@ -274,7 +275,8 @@ TOOL_DIR = @TCL_SRC_DIR@/tools
# should be compressed and linked with softlinks
MKLINKS_FLAGS = @MKLINKS_FLAGS@
@@ -50,16 +58,36 @@
CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
-I${UNIX_DIR} -I${GENERIC_DIR} \
-@@ -422,7 +423,7 @@ objs: ${OBJS}
+@@ -390,7 +392,7 @@ DEMOPROGS = browse hello ixset rmt rolod
+
+ all: binaries libraries doc
+
+-binaries: ${LIB_FILE} ${STUB_LIB_FILE} wish
++binaries: ${TK_LA_FILE} ${STUB_LIB_FILE} wish
+
+ libraries:
+
+@@ -402,7 +404,7 @@ doc: $(SRC_DIR)/doc/man.macros
+
+ # The following target is configured by autoconf to generate either
+ # a shared library or non-shared library for Tk.
+-${LIB_FILE}: ${OBJS}
++${TK_LA_FILE}: ${OBJS}
+ rm -f $@
+ @MAKE_LIB@
+
+@@ -421,8 +423,8 @@ tkLibObjs:
+ objs: ${OBJS}
- wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
+-wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
- $(CC) $(LDFLAGS) $(WISH_OBJS) \
++wish: $(WISH_OBJS) $(TK_LA_FILE) $(TK_STUB_LIB_FILE)
+ $(LD) $(LDFLAGS) $(WISH_OBJS) \
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
-@@ -436,7 +437,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
+@@ -436,7 +438,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
tktest-real:
@@ -68,7 +96,7 @@
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
-@@ -445,7 +446,7 @@ tktest-real:
+@@ -445,7 +447,7 @@ tktest-real:
# lib location logic from tktest, and it is not clear where this
# test.o object file comes from.
xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
@@ -77,3 +105,12 @@
@TK_BUILD_LIB_SPEC@ \
$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest
+@@ -507,7 +509,7 @@ install-strip:
+ # some ranlibs write to current directory, and this might not always be
+ # possible (e.g. if installing as root).
+
+-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
++install-binaries: $(TK_LA_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
+ @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
+ do \
+ if [ ! -d $$i ] ; then \
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tk/patches/patch-ab,v
retrieving revision 1.15
diff -u -r1.15 patch-ab
--- patches/patch-ab 25 Mar 2004 22:49:15 -0000 1.15
+++ patches/patch-ab 8 Apr 2004 01:01:29 -0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
+$NetBSD$
--- configure.orig Mon Mar 1 19:04:48 2004
+++ configure
@@ -480,8 +480,8 @@
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
- MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
-+ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
-+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
++ MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++ INSTALL_LIB='$(INSTALL_LIBRARY) $(TK_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
--Apple-Mail-5-1875728
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
--Apple-Mail-5-1875728--