cvs commit: ponie Configure.pl Makefile

cvsuser     04/10/02 08:04:23

  Modified:    .        Configure.pl Makefile
  Log:
  make install support. Yes, you can now set the installation prefix by
  passing --prefix=foo to Configure.pl, and make install will install ponie
  (and parrot)
  
  Revision  Changes    Path
  1.36      +17 -1     ponie/Configure.pl
  
  Index: Configure.pl
  ===================================================================
  RCS file: /cvs/public/ponie/Configure.pl,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -w -r1.35 -r1.36
  --- Configure.pl	30 Aug 2004 14:37:45 -0000	1.35
  +++ Configure.pl	2 Oct 2004 15:04:22 -0000	1.36
  @@ -1,5 +1,5 @@
   #!/usr/bin/perl -w
  -# $Id: Configure.pl,v 1.35 2004/08/30 14:37:45 nicholas Exp $
  +# $Id: Configure.pl,v 1.36 2004/10/02 15:04:22 nicholas Exp $
   
   use strict;
   use Config;
  @@ -16,11 +16,24 @@
   my $configs = $Config{config_argc};
   my $old_link;
   
  +# Somewhat a hack for the install prefix
  +my $prefix;
  +foreach (reverse @ARGV) {
  +  next unless /^--prefix=(.*)/;
  +  $prefix = $1;
  +  last;
  +}
  +if (!defined $prefix) {
  +  $prefix = $Config{prefix};
  +  push @ARGV, "--prefix=$prefix";
  +}
  +
   foreach my $i (1..$configs) {
     my $config_value = $Config{"config_arg$i"};
     next if($config_value =~/thread/i);
     next if($config_value eq '-Dmksymlinks');
     next if($config_value eq '-Duseshrplib');
  +  next if($config_value eq '-Dprefix');
     next if($config_value =~/\-de/);
     # No, we need to override the linker
     if ($config_value =~/\-Dlink=/) {
  @@ -38,7 +51,10 @@
   push @config_args,'-Dusethreads';
   push @config_args,'-Uuseithreads';
   push @config_args,'-Uuse5005threads';
  +# FIXME - should spot the parrot optimsie flag. Probably therefore should fully
  +# parse Configure's arguments.
   push @config_args,"-Doptimize='-g'";
  +push @config_args,"-Dprefix=$prefix";
   
   delete($ENV{'PERL5LIB'});
   
  
  
  
  1.5       +3 -2      ponie/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /cvs/public/ponie/Makefile,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -r1.4 -r1.5
  --- Makefile	30 Aug 2004 14:37:45 -0000	1.4
  +++ Makefile	2 Oct 2004 15:04:22 -0000	1.5
  @@ -1,4 +1,4 @@
  -# $Id: Makefile,v 1.4 2004/08/30 14:37:45 nicholas Exp $
  +# $Id: Makefile,v 1.5 2004/10/02 15:04:22 nicholas Exp $
   
   GEN_PMC = src/pmc/perl5null.pmc src/pmc/perl5nv.pmc src/pmc/perl5pv.pmc \
             src/pmc/perl5pvbm.pmc src/pmc/perl5pvcv.pmc src/pmc/perl5pvav.pmc \
  @@ -45,7 +45,8 @@
   	rm -f ponie
   
   install:
  -	error: parrot is not installable, so neither is ponie (yet)
  +	cd parrot && make install
  +	cd perl && make install
   
   test:
   	cd parrot && make -k test