summaryrefslogtreecommitdiffstats
path: root/unix/configure
diff options
context:
space:
mode:
authormdejong <mdejong>2001-04-25 21:48:21 (GMT)
committermdejong <mdejong>2001-04-25 21:48:21 (GMT)
commitd2026f0a6b8d9cd389b0fe7f8d9ba521ff99546f (patch)
treea42fe1c0afc860abc205cf3d2e22b2821ef8f4c4 /unix/configure
parent6757fe1f67686a44b5679c1032bbf5038da9a840 (diff)
downloadtcl-d2026f0a6b8d9cd389b0fe7f8d9ba521ff99546f.zip
tcl-d2026f0a6b8d9cd389b0fe7f8d9ba521ff99546f.tar.gz
tcl-d2026f0a6b8d9cd389b0fe7f8d9ba521ff99546f.tar.bz2
* unix/configure: Regen.
* unix/configure.in: Use $@ in MAKE_LIB and MAKE_STUB_LIB commands instead of using a delayed subst variable. Replace instances of STUB_LIB_FILE with TCL_STUB_LIB_FILE.
Diffstat (limited to 'unix/configure')
-rwxr-xr-xunix/configure14
1 files changed, 6 insertions, 8 deletions
diff --git a/unix/configure b/unix/configure
index 26b83c5..427f3ac 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5892,9 +5892,9 @@ if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != "" ; then
TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
eval "TCL_LIB_FILE=libtcl${TCL_SHARED_LIB_SUFFIX}"
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
+ MAKE_LIB="ar cr \$@ \${OBJS}"
else
- MAKE_LIB="\${SHLIB_LD} -o \${TCL_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
+ MAKE_LIB="\${SHLIB_LD} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
RANLIB=":"
fi
else
@@ -5912,7 +5912,7 @@ else
TCL_SHLIB_CFLAGS=""
TCL_LD_SEARCH_FLAGS="${LD_SEARCH_FLAGS}"
eval "TCL_LIB_FILE=libtcl${TCL_UNSHARED_LIB_SUFFIX}"
- MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
+ MAKE_LIB="ar cr \$@ \${OBJS}"
fi
# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
@@ -5975,13 +5975,11 @@ fi
#--------------------------------------------------------------------
# Replace ${VERSION} with contents of ${TCL_VERSION}
-eval "STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}"
+eval "TCL_STUB_LIB_FILE=libtclstub${TCL_UNSHARED_LIB_SUFFIX}"
# Replace DBGX with TCL_DBGX
-eval "STUB_LIB_FILE=\"${STUB_LIB_FILE}\""
+eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
-MAKE_STUB_LIB="ar cr \${STUB_LIB_FILE} \${STUB_LIB_OBJS}"
-
-TCL_STUB_LIB_FILE=${STUB_LIB_FILE}
+MAKE_STUB_LIB="ar cr \$@ \${STUB_LIB_OBJS}"
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"