summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-26 19:48:12 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-26 19:48:12 (GMT)
commit5d1b8bbdece14d4ef6e3e24a73c13f0d46d2d77a (patch)
tree18d95780cae3f9288e3913f5344a1be575259dd1
parente5862e78633bfd0a5cdba1e3a3d1ecc946252243 (diff)
downloadtcl-5d1b8bbdece14d4ef6e3e24a73c13f0d46d2d77a.zip
tcl-5d1b8bbdece14d4ef6e3e24a73c13f0d46d2d77a.tar.gz
tcl-5d1b8bbdece14d4ef6e3e24a73c13f0d46d2d77a.tar.bz2
merge fix
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure
index af0aed2..86f3bd6 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9001,7 +9001,7 @@ else
else
MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@'
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE) ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index da27719..0d64cc7 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2118,7 +2118,7 @@ dnl # preprocessing tests use only CPPFLAGS.
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
], [
MAKE_LIB='${STLIB_LD} [$]@ ${OBJS} ; ${RANLIB} [$]@'
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE) ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)" ; (cd "$(LIB_INSTALL_DIR)" ; $(RANLIB) $(LIB_FILE))'
])
])