diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 11:13:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-28 11:13:54 (GMT) |
| commit | 5bf292f9ab0ddda2f59f652e94185832af078740 (patch) | |
| tree | 2c1ed6aeac43100a4b7ad6192471250ff83bc847 /unix/Makefile.in | |
| parent | e309f08cc258675d9627d27fbb8c16bf5a215534 (diff) | |
| download | tk-5bf292f9ab0ddda2f59f652e94185832af078740.zip tk-5bf292f9ab0ddda2f59f652e94185832af078740.tar.gz tk-5bf292f9ab0ddda2f59f652e94185832af078740.tar.bz2 | |
Link cygwin wish.exe with win32 tk.dll, only in combination with --enable-shared
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 2559750..8388f1f 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -551,7 +551,8 @@ objs: ${OBJS} ${WISH_EXE}: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@ - @if test -f "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ + @if test "x$(TK_SHARED_BUILD)" = "x1" -a \ + -f "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ cp "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" .; \ fi ${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @WISH_BUILD_LIB_SPEC@ \ @@ -677,7 +678,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) ${WISH @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" - @if test -f "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ + @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ $(INSTALL_LIBRARY) "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ fi |