From d16b3c5ac66e2c109013f72a741632bb38197b89 Mon Sep 17 00:00:00 2001
From: mertz
Date: Tue, 16 Sep 2003 11:52:01 +0000
Subject: some simplification in Makefile.in rules for perl, a new target for
 installing zinc for tcl: install-tcl

---
 Makefile.in | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 7ce6433..f71824c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -245,6 +245,8 @@ install: all perlinstall
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 
+install-tcl: install-binaries install-libraries install-demos install-doc
+
 #========================================================================
 # This rule installs platform-independent files, such as header files.
 #========================================================================
@@ -534,25 +536,26 @@ uninstall-binaries:
 # Targets for perl/Tk
 #--------------------------------------
 
-perl: binaries
+Perl/Makefile:
+	cd Perl; perl Makefile.PL;
+
+perl: Perl/Makefile binaries
 	@if test "x$(PERL_TK_LIB)" != "x"; then \
-	cd Perl; perl Makefile.PL; make; \
-	cd demos; perl Makefile.PL; make; \
+	cd Perl; make; \
 	fi
 
-testperl: binaries
+testperl: Perl/Makefile binaries
 	@if test "x$(PERL_TK_LIB)" != "x"; then \
-	  cd Perl; perl Makefile.PL; make test; \
+	  cd Perl; make test; \
 	fi
 
-demoperl: binaries
-	(cd Perl; perl Makefile.PL; make; \
-        perl -Mblib demos/zinc-demos)
+demoperl: Perl/Makefile binaries
+	cd Perl; perl -Mblib demos/zinc-demos
 
-perlinstall: binaries
+perlinstall: Perl/Makefile binaries
 	@echo "ZINC_ENABLE_PTK --> $(ZINC_ENABLE_PTK) $(INSTALL_PROGRAM) $(PERL_TK_LIB) DESTDIR=$(DESTDIR)"
 	@if test "x$(PERL_TK_LIB)" != "x"; then \
 	  $(INSTALL_DATA) $($(PACKAGE)_LIB_FILE) $(prefix)/lib; \
-	  cd Perl; perl Makefile.PL; make; make install; \
+	  cd Perl; make install; \
 	fi
 
-- 
cgit v1.1