summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-06 08:16:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-06 08:16:36 (GMT)
commit30a0f07209b1340b0060d238a1ec0bd3365f5692 (patch)
treea409e7b63586fe575bcbdaee8f91824d672d1d25
parentde76506f536b8af35a1cc81597de6c691e105248 (diff)
downloadtk-30a0f07209b1340b0060d238a1ec0bd3365f5692.zip
tk-30a0f07209b1340b0060d238a1ec0bd3365f5692.tar.gz
tk-30a0f07209b1340b0060d238a1ec0bd3365f5692.tar.bz2
[Bug 3532186] pkgIndex.tcl file complexity
-rw-r--r--ChangeLog5
-rw-r--r--unix/Makefile.in15
-rw-r--r--win/Makefile.in2
3 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c45255..d11c59d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-06 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * unix/Makefile.in: [Bug 3532186] pkgIndex.tcl file complexity
+ * win/Makefile.in:
+
2012-06-02 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tkInt.decls: Change XSetDashes signature and many others
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 406eeac..9d4646a 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -719,15 +719,16 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
(\
echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
- 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 " }";\
+ if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \
+ echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
+ else \
+ echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\
+ echo " && ([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\
+ echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [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}$(TK_LIB_FILE)] Tk]";\
+ echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\
echo "}";\
+ fi \
) > "$(PKG_INDEX)"; \
fi
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
diff --git a/win/Makefile.in b/win/Makefile.in
index 6bfa4ad..80c818c 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -606,7 +606,7 @@ $(WISH): $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(WISH_OBJS) wish.$(RES)
wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW)
@VC_MANIFEST_EMBED_EXE@
-tktest : $(TKTEST)
+tktest: $(TKTEST)
$(TKTEST): $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32)
$(CC) $(CFLAGS) $(TKTEST_OBJS) $(TCL_LIB_FILE) \