Change 11155 by jhi@alpha on 2001/07/05 03:40:24
Subject: [PATCH] -I and MakeMaker again
From: Michael G Schwern <[EMAIL PROTECTED]>
Date: Wed, 4 Jul 2001 15:03:07 -0400
Message-ID: <20010704150307.I20340@blackrider>
(and retract #11145)
Affected files ...
... //depot/perl/ext/util/make_ext#11 edit
... //depot/perl/lib/ExtUtils/MM_Unix.pm#106 edit
... //depot/perl/lib/ExtUtils/MakeMaker.pm#62 edit
Differences ...
==== //depot/perl/ext/util/make_ext#11 (text) ====
==== //depot/perl/lib/ExtUtils/MM_Unix.pm#106 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm.~1~ Wed Jul 4 21:45:06 2001
+++ perl/lib/ExtUtils/MM_Unix.pm Wed Jul 4 21:45:06 2001
@@ -3512,7 +3512,7 @@
$asl = "\$AutoSplit::Maxlen=$attribs{MAXLEN};" if $attribs{MAXLEN};
q{
# Usage: $(AUTOSPLITFILE) FileToSplit AutoDirToSplitInto
-AUTOSPLITFILE = $(PERLRUNINST) -e 'use AutoSplit;}.$asl.q{autosplit($$ARGV[0],
$$ARGV[1], 0, 1, 1) ;'
+AUTOSPLITFILE = $(PERLRUN) -e 'use AutoSplit;}.$asl.q{autosplit($$ARGV[0], $$ARGV[1],
+0, 1, 1) ;'
};
}
@@ -3539,13 +3539,13 @@
push @m, q{
# The following is a portable way to say mkdir -p
# To see which directories are created, change the if 0 to if 1
-MKPATH = $(PERLRUNINST) -MExtUtils::Command -e mkpath
+MKPATH = $(PERLRUN) -MExtUtils::Command -e mkpath
# This helps us to minimize the effect of the .exists files A yet
# better solution would be to have a stable file in the perl
# distribution with a timestamp of zero. But this solution doesn't
# need any changes to the core distribution and works with older perls
-EQUALIZE_TIMESTAMP = $(PERLRUNINST) -MExtUtils::Command -e eqtime
+EQUALIZE_TIMESTAMP = $(PERLRUN) -MExtUtils::Command -e eqtime
};
==== //depot/perl/lib/ExtUtils/MakeMaker.pm#62 (text) ====
Index: perl/lib/ExtUtils/MakeMaker.pm
--- perl/lib/ExtUtils/MakeMaker.pm.~1~ Wed Jul 4 21:45:06 2001
+++ perl/lib/ExtUtils/MakeMaker.pm Wed Jul 4 21:45:06 2001
@@ -411,7 +411,7 @@
}
if ($self->{PARENT}) {
$self->{PARENT}->{CHILDREN}->{$newclass} = $self;
- foreach my $opt (qw(CAPI POLLUTE)) {
+ foreach my $opt (qw(CAPI POLLUTE PERL_CORE)) {
if (exists $self->{PARENT}->{$opt}
and not exists $self->{$opt})
{
@@ -1647,12 +1647,15 @@
=item PERLRUN
- $(PERL) -I$(PERL_ARCH) -I$(PERL_LIB)
-
+Use this instead of $(PERL) or $(FULLPERL) when you wish to run perl.
+It will set up extra necessary flags for you.
+
=item PERLRUNINST
-
- $(PERL) -I$(INST_ARCH) -I$(INST_LIB) -I$(PERL_ARCH) -I$(PERL_LIB)
-
+
+Use this instead of $(PERL) or $(FULLPERL) when you wish to run
+perl to work with modules. It will add things like -I$(INST_ARCH)
+and other necessary flags.
+
=item PERL_SRC
Directory containing the Perl source code (use of this should be
@@ -1772,8 +1775,9 @@
=item TEST_LIBS
-The set of -I's necessary to run a "make test".
-
+The set of -I's necessary to run a "make test". Use as:
+$(PERL) $(TEST_LIBS) -e '...' for example.
+
=item TYPEMAPS
Ref to array of typemap file names. Use this when the typemaps are
End of Patch.