diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 15:23:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 15:23:25 (GMT) |
| commit | fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6 (patch) | |
| tree | 395ef36a3124aa88061682c8f522fe266d2fb73a /win/Makefile.in | |
| parent | 07212f98d3048b772094a64325e930e1c0364964 (diff) | |
| parent | c985425b2f03e2e14bf3f7ee9884cd74c184373e (diff) | |
| download | tk-fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6.zip tk-fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6.tar.gz tk-fad48a7b6368bdb719b8b5cdc77f19ee4b089ee6.tar.bz2 | |
merge core-8-4-branch
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 9304b43..714b0e9 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -427,10 +427,13 @@ install-binaries: binaries @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); @(\ - echo "if {[package vcompare [package provide Tcl]\ - $(TCLVERSION)] != 0} { return }";\ - echo "package ifneeded Tk $(VERSION)\ - [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ + echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\ + echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\ + echo " && ([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\ + echo " package ifneeded Tk $(VERSION) [list load [file join \$$dir .. .. bin libtk$(VERSION).dll] Tk]";\ + echo "} else {";\ + echo " package ifneeded Tk $(VERSION) [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 \ @@ -642,7 +645,19 @@ $(GENERIC_DIR)/tkStubInit.c: $(GENERIC_DIR)/tk.decls \ @echo "This warning can be safely ignored, do not report as a bug!" genstubs: - $(TCL_EXE) "$(TCL_TOOL_DIR}\genStubs.tcl" \ + $(TCL_EXE) "$(TCL_TOOL_DIR)/genStubs.tcl" \ "$(GENERIC_DIR_NATIVE)" \ - "$(GENERIC_DIR_NATIVE)\tk.decls" \ - "$(GENERIC_DIR_NATIVE)\tkInt.decls" + "$(GENERIC_DIR_NATIVE)/tk.decls" \ + "$(GENERIC_DIR_NATIVE)/tkInt.decls" +# +# The list of all the targets that do not correspond to real files. This stops +# 'make' from getting confused when someone makes an error in a rule. +# + +.PHONY: all binaries libraries doc tkLibObjs objs tktest-real test test-classic +.PHONY: test-ttk testlang runtest shell demo gdb install install-strip +.PHONY: install-binaries install-libraries install-demos install-doc +.PHONY: install-private-headers clean distclean depend genstubs checkstubs +.PHONY: checkuchar checkexports rpm dist alldist allpatch html html-tcl html-tk + +# DO NOT DELETE THIS LINE -- make depend depends on it. |