summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-18 04:56:31 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-18 04:56:31 (GMT)
commit8cbffc7afed23ff28a360bbe51d7b88e5919ee21 (patch)
treed843028a3c7ae2acb84e1a78407f59c206505ff0 /unix/Makefile.in
parentbeb2fa12050651e1be1a182fd1a7c814aa8e283c (diff)
parent9517b261f6fbdfd580edb5b4846084051c43261c (diff)
downloadtk-8cbffc7afed23ff28a360bbe51d7b88e5919ee21.zip
tk-8cbffc7afed23ff28a360bbe51d7b88e5919ee21.tar.gz
tk-8cbffc7afed23ff28a360bbe51d7b88e5919ee21.tar.bz2
make loading of tk.dll in cygwin possible
reduce command table size
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in11
1 files changed, 9 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 2ab5913..0e73871 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -724,8 +724,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
(\
echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} return";\
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
- echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
- [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
+ echo "if {[string match CYGWIN* \$$::tcl_platform(os)]} {";\
+ echo " if {([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\
+ echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\
+ echo " } else {";\
+ echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\
+ echo " }";\
+ echo "} else {";\
+ echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
+ echo "}";\
) > "$(PKG_INDEX)"; \
fi
@echo "Installing $(LIB_FILE) to @DLL_INSTALL_DIR@/"