summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-11-22 17:12:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-11-22 17:12:34 (GMT)
commita50ed9dff56a7287a0d18e782d8a6caed2ea0faa (patch)
tree2247e8f011b29f80da9266242f19309a2f0fe6bb
parent82846ec5bdd7ad377edf83c1c3aa6759c1c54ecd (diff)
parente8fb7d316cdd838a4bd4658932ec3a567eb20e50 (diff)
downloadtk-a50ed9dff56a7287a0d18e782d8a6caed2ea0faa.zip
tk-a50ed9dff56a7287a0d18e782d8a6caed2ea0faa.tar.gz
tk-a50ed9dff56a7287a0d18e782d8a6caed2ea0faa.tar.bz2
[Bug 1945073]: Demo square.tcl cannot run; need package tktest
-rw-r--r--ChangeLog5
-rw-r--r--unix/Makefile.in4
-rw-r--r--win/Makefile.in6
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 641f682..2f06971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-22 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * unix/Makefile.in: [Bug 1945073]: Demo square.tcl
+ * win/Makefile.in: cannot run; need package tktest
+
2011-11-17 Jan Nijtmans <nijtmans@users.sf.net>
* doc/menu.n: Fix the escaping of leading dots in lines that start with
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 492c7ca..2ab5913 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -801,7 +801,11 @@ install-demos:
done;
@for i in $(DEMOPROGS); \
do \
+ if test $$i = "square"; then \
+ rm -f "$(DEMO_INSTALL_DIR)"/$$i; \
+ else \
chmod 755 "$(DEMO_INSTALL_DIR)"/$$i; \
+ fi; \
done;
@echo "Installing demo images to $(DEMO_INSTALL_DIR)/images/";
@for i in $(TOP_DIR)/library/demos/images/*; \
diff --git a/win/Makefile.in b/win/Makefile.in
index cc50160..431b5cc 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -553,13 +553,17 @@ install-demos:
@for i in $(ROOT_DIR)/library/demos/*; \
do \
if [ -f $$i ] ; then \
- sed -e '3 s|exec $(WISH)|exec $(WISH)|' \
+ sed -e '3 s|exec wish|exec wish$(VER)|' \
$$i > $(SCRIPT_INSTALL_DIR)/demos/`basename $$i`; \
fi; \
done;
@for i in $(DEMOPROGS); \
do \
+ if test $$i = "square"; then \
+ rm -f $(SCRIPT_INSTALL_DIR)/demos/$$i; \
+ else \
chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
+ fi; \
done;
@echo "Installing demo images";
@for i in $(ROOT_DIR)/library/demos/images/*; \