this release works fine for perl, and is need for cpan-isation

however it seems buggy for tcl!
the previous version worked fine for both tcl and perl, but was
not CPAN compliant, so we will have to enhance the file again

1 files changed, 22 insertions, 12 deletions

diff --git a/Makefile.in b/Makefile.in
index 9d30860..2dee2ba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -149,6 +149,9 @@ TK_TOP_DIR_NATIVE	= @TK_TOP_DIR_NATIVE@
 # Not used, but retained for reference of what libs Tcl required
 TCL_LIBS	= @TCL_LIBS@
 
+# Used to know whether we are installing with PTK
+PERL_TK_LIB	= @PERL_TK_LIB@
+
 #========================================================================
 # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
 # package without installing.  The other environment variables allow us
@@ -198,7 +201,7 @@ COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(C
 # for the BINARIES that you specified above have already been done.
 #========================================================================
 
-all: binaries libraries doc
+all: binaries libraries perl doc
 
 #========================================================================
 # The binaries target builds executable programs, Windows .dll's, unix
@@ -237,7 +240,8 @@ html: doc/refman.tex
 	mkdir -p refman; cp -f *.png refman; \
 	latex2html -split 4 -show_section_numbers -local_icons refman.tex)
 
-install: all install-binaries install-libraries install-demos install-doc
+#install: all install-binaries install-libraries install-demos install-doc perlinstall
+install: all perlinstall
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 
@@ -303,8 +307,8 @@ install-doc: doc
 	  fi \
 	done
 
-test: binaries libraries
-	$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
+test: binaries libraries testperl
+	  $(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) \
 
 shell: binaries libraries
 	@$(TCLSH) $(SCRIPT)
@@ -529,19 +533,25 @@ uninstall-binaries:
 #--------------------------------------
 
 perl: binaries
-	(cd Perl; perl Makefile.PL; make)
-	(cd Perl/demos; perl Makefile.PL)
-	(cd Perl/debug; perl Makefile.PL)
+	@if test "x$(PERL_TK_LIB)" != "x"; then \
+	cd Perl; perl Makefile.PL; make; \
+	cd demos; perl Makefile.PL; make; \
+	cd ../debug; perl Makefile.PL; make; \
+	fi
 
 testperl: binaries
-	(cd Perl; perl Makefile.PL; make test)
+	@if test "x$(PERL_TK_LIB)" != "x"; then \
+	  cd Perl; perl Makefile.PL; make test; \
+	fi
 
 demoperl: binaries
 	(cd Perl; perl Makefile.PL; make; \
         perl -Mblib demos/zinc-demos)
 
 perlinstall: binaries
-	(cd Perl; make; make $(INSTALL_PERL))
-	(cd Perl/demos; make; make $(INSTALL_PERL))
-	(cd Perl/debug; make; make $(INSTALL_PERL))
-	$(INSTALL_DATA) $($(PACKAGE)_LIB_FILE) $(prefix)/lib
+	@echo "ZINC_ENABLE_PTK --> $(ZINC_ENABLE_PTK) $(INSTALL_PROGRAM) $(PERL_TK_LIB)"
+	@if test "x$(PERL_TK_LIB)" != "x"; then \
+	  cd Perl; perl Makefile.PL; make; make install; \
+	  cd demos; perl Makefile.PL; make; make install; \
+	  cd ../debug; perl Makefile.PL; make; make install; \
+	fi