diff options
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 5 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 1a2f6f5..4e83c09 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -57,6 +57,7 @@ BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir) # Directory in which to install the .a or .so binary for the Tk library: LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir) +DLL_INSTALL_DIR = @DLL_INSTALL_DIR@ # Path name to use when installing library scripts. SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY) @@ -727,9 +728,9 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) wish@EXEEXT@ echo "}";\ ) > "$(PKG_INDEX)"; \ fi - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ - @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE) + @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @echo "Installing wish@EXEEXT@ as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@" @$(INSTALL_PROGRAM) wish@EXEEXT@ "$(BIN_INSTALL_DIR)"/wish$(VERSION)@EXEEXT@ @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 76199a0..8318724 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -182,7 +182,9 @@ #define TkpButtonSetDefaults(specPtr) {} #define TkpDestroyButton(butPtr) {} #define TkSelUpdateClipboard(a,b) {} +#ifndef __CYGWIN__ #define TkSetPixmapColormap(p,c) {} +#endif /* * These calls implement native bitmaps which are not supported under @@ -197,9 +199,10 @@ * This macro stores a representation of the window handle in a string. * This should perhaps use the real size of an XID. */ - +#ifndef __CYGWIN__ #define TkpPrintWindowId(buf,w) \ sprintf((buf), "%#08lx", (unsigned long) (w)) +#endif /* * The following declaration is used to get access to a private Tcl interface |