summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-06 09:11:27 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-06 09:11:27 (GMT)
commit676eb78eadce63bc5b6a98b6c1f2d077b49a9869 (patch)
treeef695f73321340160f7928d321ec3f8309648b4b /win
parentadc2b98bbf0fed75d90775d3e1706c5246c72521 (diff)
downloadtk-676eb78eadce63bc5b6a98b6c1f2d077b49a9869.zip
tk-676eb78eadce63bc5b6a98b6c1f2d077b49a9869.tar.gz
tk-676eb78eadce63bc5b6a98b6c1f2d077b49a9869.tar.bz2
[Bug 3532186] pkgIndex.tcl file complexity
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in15
1 files changed, 9 insertions, 6 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 04e3d85..89f57bc 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -445,7 +445,7 @@ runtest: binaries $(TKTEST) $(TEST_DLL_FILE)
shell: binaries
$(SHELL_ENV) ./$(WISH) $(SCRIPT)
-demo:
+demo: $(WISH)
$(SHELL_ENV) ./$(WISH) $(ROOT_DIR)/library/demos/widget
# This target can be used to run wish inside either gdb or insight
@@ -478,10 +478,13 @@ install-binaries: binaries
@echo "Creating package index $(PKG_INDEX)";
@$(RM) $(PKG_INDEX);
@(\
- echo "if {[catch {package present Tcl\
- $(TCLVERSION)$(TCLPATCHL)}]} { return }";\
- echo "package ifneeded Tk $(VERSION)$(PATCH_LEVEL)\
- [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\
+ echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} { return }";\
+ echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\
+ echo " && ([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\
+ echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\
+ echo "} else {";\
+ echo " package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\
+ echo "}";\
) > $(PKG_INDEX);
@for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \
do \
@@ -678,7 +681,7 @@ tkWindow.$(OBJEXT): configure Makefile
.SUFFIXES: .$(RES)
.SUFFIXES: .rc
-# Implicit rule for all object files that will end up in the Tcl library
+# Implicit rule for all object files that will end up in the Tk library
%.$(OBJEXT): %.c
$(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME)