From 3f47be9fe5d3006927c79eb156cfbed946243e26 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Fri, 4 Feb 2000 15:05:00 +0000
Subject: Ameliorations de la compil/installation en Perl

---
 Makefile.in | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index ac0e3af..6d104e8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,16 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL = @INSTALL@
 
+# PERL PATHS
+INSTALLARCHLIB = @INSTALLARCHLIB@
+INSTALLPRIVLIB = @INSTALLPRIVLIB@
+INSTALLMAN1DIR = @INSTALLMAN1DIR@
+INSTALLMAN3DIR = @INSTALLMAN3DIR@
+
+PERLCONFIG = INSTALLDIRS=perl INSTALLMAN1DIR=$(INSTALLMAN1DIR) INSTALLMAN3DIR=$(INSTALLMAN3DIR) INSTALLPRIVLIB=$(INSTALLPRIVLIB) INSTALLARCHLIB=$(INSTALLARCHLIB)
+
+INSTALL_PERL = install_perl
+
 prefix = $(HOME)
 exec_prefix = $(prefix)
 
@@ -56,7 +66,7 @@ CPPFLAGS =  @DEFS@ @X_CFLAGS@ $(DFLAGS) -I$(srcdir) -DBUILD_LIBRARY
 #SITEPERL = /usr/local/lib/perl5/site_perl
 #
 # Auto
-PTKLIB = @PERLLIB@/Tk/pTk
+PTKLIB = @INSTALLARCHLIB@/Tk/pTk
 SITEPERL = @SITEPERL@
 PTKCFLAGS = -DPTK -I$(PTKLIB)
 
@@ -126,11 +136,12 @@ ptkzinc: libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so Perl/Makefile_nodebug
 ptkzinc_debug: libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so Perl/Makefile_debug
 	(cd Perl; make "LD_RUN_PATH=@X_LIBS@")
 testptk: ptkzinc
-	(cd Perl; make pure_install; perl -I$(SITEPERL) t/zinc.pl)
+	(cd Perl; make test "FULLPERL=PERL_DL_NONLAZY=0 perl")
 Perl/Makefile_nodebug:
-	(cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR) $(PTKLIB))
+	(cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR) $(PERLCONFIG))
 Perl/Makefile_debug:
-	(cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR)_debug $(PTKLIB))
+	(cd Perl; perl Makefile.PL ptkzinc$(ZINC_VER).$(ZINC_MAJOR)_debug $(PERLCONFIG))
+
 libptkzinc$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkobjs) libom.so
 	$(CC) $(SHARED_TK_LDFLAGS) -o $@ $(SHARED_TK_LIBS) -L. -lom $(ptkobjs)
 libptkzinc_debug$(ZINC_VER).$(ZINC_MAJOR).so: ptk $(ptkgobjs) libom_debug.so
@@ -176,9 +187,9 @@ installtk: installdirs $(tklibs)
 	cd $(libdir) && rm -f libtkzinc.so
 	for f in $(hfiles); do $(INSTALL_DATA) $$f $(incdir); done
 
-installptk: $(ptklibs) Perl/Makefile_nodebug
+installptk: $(ptklibs)
 	$(INSTALL_DATA) $(ptklibs) $(libdir)
-	(cd Perl; make; make install_perl PREFIX=$(prefix))
+	(cd Perl; make; make $(INSTALL_PERL))
 
 installdirs:
 	$(srcdir)/mkinstalldirs $(libdir) $(incdir) $(mandir)
@@ -231,4 +242,7 @@ depend:
 	rm -f depends
 	mv depend.temp depends
 
+depends:
+	touch depends
+
 include depends
-- 
cgit v1.1