diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | win/Makefile.in | 6 |
3 files changed, 14 insertions, 1 deletions
@@ -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/*; \ |