* Switched back to tclsh to generate pkgIndex.tcl.

	* demos/data is now correctly installed.
        * When installing pkgIndex.tcl is made from all the library files
	  found is the target directory, not just the binary modules.

1 files changed, 16 insertions, 4 deletions

diff --git a/Makefile.in b/Makefile.in
index 5beecb9..9d30860 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -270,6 +270,7 @@ install-demos:
 	  fi; \
 	done
 	@mkdir -p $(DESTDIR)$(pkglibdir)/demos/images
+	@mkdir -p $(DESTDIR)$(pkglibdir)/demos/data
 	@for p in $(srcdir)/demos/images/*; do \
 	  if test -f $$p; then \
 	    p=`basename $$p`; \
@@ -277,6 +278,13 @@ install-demos:
 	    $(INSTALL_DATA) $(srcdir)/demos/images/$$p $(DESTDIR)$(pkglibdir)/demos/images/$$p; \
 	  fi; \
 	done
+	@for p in $(srcdir)/demos/data/*; do \
+	  if test -f $$p; then \
+	    p=`basename $$p`; \
+	    echo " Install $$p $(DESTDIR)$(pkglibdir)/demos/data/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/demos/data/$$p $(DESTDIR)$(pkglibdir)/demos/data/$$p; \
+	  fi; \
+	done
 
 #========================================================================
 # Install documentation.  Unix manpages should go in the $(mandir)
@@ -363,7 +371,7 @@ VPATH = $(srcdir):$(srcdir)/libtess:$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/w
 #========================================================================
 
 pkgIndex.tcl:
-	( echo package require Tk \; pkg_mkIndex -load Tk . $($(PACKAGE)_LIB_FILE) \; exit; ) | $(WISH)
+	( echo package require Tk \; pkg_mkIndex -load Tk . $($(PACKAGE)_LIB_FILE) \; exit; ) | $(TCLSH)
 
 pkgIndex.tcl-hand:
 	(echo 'package ifneeded $(PACKAGE) $(VERSION) \
@@ -471,8 +479,8 @@ install-lib-binaries:
 #
 # Construct a full pkgIndex in the installation directory
 	(cd $(DESTDIR)$(pkglibdir); \
-	  (echo package require Tk \; pkg_mkIndex -load Tk . $($(PACKAGE)_LIB_FILE) \
-		$(RUNTIME_SOURCES) \; exit;) | $(WISH))
+	  (echo package require Tk \; pkg_mkIndex -load Tk . \
+		$(RUNTIME_SOURCES) \; exit;) | $(TCLSH))
 
 #========================================================================
 # Install binary executables (e.g. .exe files and dependent .dll files)
@@ -526,7 +534,11 @@ perl: binaries
 	(cd Perl/debug; perl Makefile.PL)
 
 testperl: binaries
-	(cd Perl; perl Makefile.PL; make test "FULLPERL=PERL_DL_NONLAZY=0 perl")
+	(cd Perl; perl Makefile.PL; make test)
+
+demoperl: binaries
+	(cd Perl; perl Makefile.PL; make; \
+        perl -Mblib demos/zinc-demos)
 
 perlinstall: binaries
 	(cd Perl; make; make $(INSTALL_PERL))