diff options
| -rwxr-xr-x | Configure | 9 | ||||
| -rw-r--r-- | hints/irix_5.sh | 1 | ||||
| -rw-r--r-- | hints/irix_6.sh | 1 | ||||
| -rw-r--r-- | hints/linux.sh | 6 | ||||
| -rw-r--r-- | lib/ExtUtils/MakeMaker.pm | 9 | ||||
| -rw-r--r-- | perl.c | 1 | ||||
| -rw-r--r-- | pod/Makefile | 51 |
7 files changed, 62 insertions, 16 deletions
@@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.7 1995/03/21 08:46:15 ram Exp $ # -# Generated on Fri Apr 14 15:43:12 EDT 1995 [metaconfig 3.0 PL53] +# Generated on Mon Apr 17 15:46:57 EDT 1995 [metaconfig 3.0 PL53] cat >/tmp/c1$$ <<EOF ARGGGHHHH!!!!! @@ -4296,7 +4296,7 @@ use no flags, say "none". EOM case "$lddlflags" in - ''|' ') case "$osname" in + '') case "$osname" in hpux) dflt='-b' ;; linux) dflt='-shared' ;; next) dflt='none' ;; @@ -4323,7 +4323,7 @@ say "none". EOM case "$ccdlflags" in - ''|' ') case "$osname" in + '') case "$osname" in hpux) dflt='-Wl,-E' ;; linux) dflt='-rdynamic' ;; next) dflt='none' ;; @@ -7392,7 +7392,8 @@ EOS chmod +x ccsym $eunicefix ccsym ./ccsym | $sort | $uniq >ccsym.raw -$awk '/\=/ { print $0; next } { print $0"=1" }' ccsym.raw >ccsym.list +$awk '/\=/ { print $0; next } + { print $0"=1" }' ccsym.raw >ccsym.list $awk '{ print $0"=1" }' Cppsym.true >ccsym.true $comm -13 ccsym.true ccsym.list >ccsym.own $comm -12 ccsym.true ccsym.list >ccsym.com diff --git a/hints/irix_5.sh b/hints/irix_5.sh index 113312b43d..2f1e8559e7 100644 --- a/hints/irix_5.sh +++ b/hints/irix_5.sh @@ -1,4 +1,5 @@ # irix_5.sh +ld=ld i_time='define' ccflags="$ccflags -D_POSIX_SOURCE -ansiposix -D_BSD_TYPES -Olimit 3000" lddlflags="-shared" diff --git a/hints/irix_6.sh b/hints/irix_6.sh index 5752c25e1c..0c4b0fc7b5 100644 --- a/hints/irix_6.sh +++ b/hints/irix_6.sh @@ -7,6 +7,7 @@ # Perl built with this hints file under IRIX 6.0.1 passes # all tests (`make test'). +ld=ld i_time='define' cc="cc -32" ccflags="$ccflags -D_POSIX_SOURCE -ansiposix -D_BSD_TYPES -Olimit 3000" diff --git a/hints/linux.sh b/hints/linux.sh index 46059e0731..00643ca2f9 100644 --- a/hints/linux.sh +++ b/hints/linux.sh @@ -10,6 +10,10 @@ # # Last updated Thu Apr 6 12:22:03 EDT 1995 # +# If you wish to use something other than 'gcc' for your compiler, +# you should specify it on the Configure command line. To use +# gcc-elf, for exmample, type +# ./Configure -Dcc=gcc-elf # perl goes into the /usr tree. See the Filesystem Standard # available via anonymous FTP at tsx-11.mit.edu in @@ -64,7 +68,7 @@ main() { exit(0); /* succeed (yes, it's ELF) */ } EOM -if gcc try.c >/dev/null 2>&1 && ./a.out; then +if ${cc:-gcc} try.c >/dev/null 2>&1 && ./a.out; then cat <<'EOM' You appear to have ELF support. I'll try to use it for dynamic loading. diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm index d8d5d6fb30..fb2dc14af4 100644 --- a/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker; -$Version = 4.093; # Last edited 12 Apr 1995 by Andy Dougherty +$Version = 4.094; # Last edited 17 Apr 1995 by Andy Dougherty use Config; use Carp; @@ -1229,7 +1229,7 @@ sub const_cccmd{ ."Please notify perl5-porters\@nicoh.com\n"; } my($cccmd)=($old) ? $old : $new; - $cccmd =~ s/\b\Q$Config{'cc'}\E\b/\$(CC)/; + $cccmd =~ s/^\s*\Q$Config{'cc'}\E\s/\$(CC) /; "CCCMD = $cccmd\n"; } @@ -2436,7 +2436,6 @@ v4.091 April 3 1995 by Andy Dougherty Another attempt to fix writedoc() from Dean Roehrich. - v4.092 April 11 1994 by Andreas Koenig Fixed a docu bug in hint file description. Added printing of a warning @@ -2469,7 +2468,9 @@ are handled. Include Tim's suggestions about $verbose and more careful substitution of $(CC) for $Config{'cc'}. -Minor cosmetic fixes for my 80-character wide terminal. +v4.094 April 12 1994 by Andy Dougherty + +Include Andreas' improvement of $(CC) detection. =head1 NOTES @@ -996,6 +996,7 @@ char *s; return s; case 'v': printf("\nThis is perl, version %s\n\n",patchlevel); + fputs("\tUnofficial patchlevel 1e.\n",stdout); fputs("\nCopyright 1987-1994, Larry Wall\n",stdout); #ifdef MSDOS fputs("MS-DOS port Copyright (c) 1989, 1990, Diomidis Spinellis\n", diff --git a/pod/Makefile b/pod/Makefile index 47fc2e9512..fa16e2ce9d 100644 --- a/pod/Makefile +++ b/pod/Makefile @@ -89,25 +89,62 @@ HTML = \ perltrap.html \ perlvar.html -man: $(MAN) - -# pod2html runs on all the pods at once in order to build up +TEX = \ + perl.tex \ + perlapi.tex \ + perlbook.tex \ + perlbot.tex \ + perlcall.tex \ + perldata.tex \ + perldebug.tex \ + perldiag.tex \ + perlembed.tex \ + perlform.tex \ + perlfunc.tex \ + perlguts.tex \ + perlipc.tex \ + perlmod.tex \ + perlobj.tex \ + perlop.tex \ + perlovl.tex \ + perlpod.tex \ + perlre.tex \ + perlref.tex \ + perlrun.tex \ + perlsec.tex \ + perlstyle.tex \ + perlsub.tex \ + perlsyn.tex \ + perltrap.tex \ + perlvar.tex + + +man: pod2man $(MAN) + +# pod2html normally runs on all the pods at once in order to build up # cross-references. -html: +html: pod2html $(PERL) pod2html *.pod +tex: pod2latex $(TEX) + .SUFFIXES: .pod .man -.pod.man: +.pod.man: pod2man $(PERL) pod2man $*.pod >$*.man .SUFFIXES: .pod .html -.pod.html: +.pod.html: pod2html $(PERL) pod2html $*.pod +.SUFFIXES: .pod .tex + +.pod.tex: pod2latex + $(PERL) pod2latex $*.pod + clean: - rm -f $(MAN) $(HTML) + rm -f $(MAN) $(HTML) $(TEX) realclean: clean rm -f pod2man pod2latex pod2html |