summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-11-26 12:01:35 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-11-26 12:01:35 (GMT)
commit0994fde7781b45449af20570e7ac1295e647cab9 (patch)
tree008c40d1362dbf4a5fbdfcf1dac4097d9272434a /unix
parentfc14de1ab112a42834e1e228296e22b1a6e18d71 (diff)
parenta90dcf7e3dbae2714513cbc09ec978dfcf21aa55 (diff)
downloadtcl-0994fde7781b45449af20570e7ac1295e647cab9.zip
tcl-0994fde7781b45449af20570e7ac1295e647cab9.tar.gz
tcl-0994fde7781b45449af20570e7ac1295e647cab9.tar.bz2
On cygwin, install libtcl8.6.dll.a in the {prefix}/lib directory. On win32, don't create empty {prefix}/lib/tcl8/8.2 and {prefix}/lib/tcl8/8.3 directories any more during installing.
Diffstat (limited to 'unix')
-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 f849817..c19a77a 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8839,7 +8839,7 @@ fi
MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
if test "${SHLIB_SUFFIX}" = ".dll"; then
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
else
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index c9fd9b5..57d8ff0 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2050,7 +2050,7 @@ dnl # preprocessing tests use only CPPFLAGS.
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
], [
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'