This is my patch patch.0a for perl5.000.

[Actually, that's a lie.  This is just MakeMaker 3.6.  I've just
usurped the letter 'a' to fit it into my patch sequence.]

        Andy Dougherty                  doughera@lafcol.lafayette.edu
        Dept. of Physics
        Lafayette College, Easton PA

this patch includes:

- My recently posted 'Very small patches to AutoSplit.pm and Cwd.pm'
  (with no changes).

- A previous small patch to DynaLoader .bs handling with one addition:
  !     if (-f $bs) {
  !     if (-s $bs) { # only read file if it's not empty

- A recently posted patch to hints/aix.sh (with cosmetic changes).

Hopefully no further changes to MakeMaker will be needed before perl5.001.
If any changes are required I intend that they will be release as patches
to be applied over this one. This is the last MakeMaker jumbo patch for
perl5.000.

Patch and enjoy.

Regards,
Tim Bunce.

p.s. I'll be around until about 4pm GMT tomorrow (Tuesday), after that
I'm off for Christmas. This has been a great year for me. I have very
much enjoyed working with the perl5-porters and I wish you all a
wonderful and merry Christmas and a very happy New Year.

1 files changed, 29 insertions, 19 deletions

diff --git a/ext/util/make_ext b/ext/util/make_ext
index fba77c0c9f..05f43761e9 100644
--- a/ext/util/make_ext
+++ b/ext/util/make_ext
@@ -7,8 +7,10 @@
 # It may be deleted in a later release of perl so try to
 # avoid using it for other purposes.
 
-linktype=$1
-extspec=$2
+target=$1;  shift
+extspec=$1; shift
+passthru="$*" # allow extra macro=value to be passed through
+echo ""
 
 case $CONFIG in
 '')
@@ -31,33 +33,39 @@ fi
 
 # convert old style Name.a into ext/Name/Name.a format
 case "$extspec" in
-ext/*) ;;
-*) extspec=`echo "$extspec" | sed -e 's:\(.*\)\.\(.*\):ext/\1/\1.\2:'`
+ext/*)	;;
+*::*)	extspec=`echo "$extspec" | sed -e 's!\(.*\)::\(.*\)!ext/\1/\2/\2.a!'` ;;
+*)	extspec=`echo "$extspec" | sed -e 's:\(.*\)\.\(.*\):ext/\1/\1.\2:'` ;;
 esac
 
 # get extension directory path, module name and depth
 pname=`echo "$extspec" | sed -e 's:^ext/::' -e 's:/[^/]*$::'`
 mname=`echo "$pname"   | sed -e 's!/!::!'`
 depth=`echo "$pname"   | sed -e 's![^/][^/]*!..!g'`
+make=${altmake-make}
+makeargs=''
 
 if test ! -d "ext/$pname"; then
-	echo "	Skipping $extspec (directory does not exist)"
-	exit 0 # not an error ?
+    echo "	Skipping $extspec (directory does not exist)"
+    exit 0 # not an error ?
 fi
 
-# check link type and do any preliminaries
-case "$linktype" in
-static)  makeargs='CCCDLFLAGS=' ;;
-dynamic) makeargs='' ;;
-*)	echo "make_ext: unknown link type '$linktype'"; exit 1;;
-'')	echo "make_ext: no link type specified (eg static or dynamic)"; exit 1;;
-esac
 
-echo ""
-echo "	Making $mname ($linktype)"
+echo "	Making $mname ($target)"
 
 cd ext/$pname
 
+# check link type and do any preliminaries
+case "$target" in
+	# convert 'static' or 'dynamic' into 'all LINKTYPE=XXX'
+static)  makeargs="LINKTYPE=static CCCDLFLAGS="; target=all ;;
+dynamic) makeargs="LINKTYPE=dynamic";            target=all ;;
+*clean)	;;
+*)	# for the time being we are strict about what make_ext is used for
+	echo "make_ext: unknown make target '$target'"; exit 1;;
+'')	echo "make_ext: no make target specified (eg static or dynamic)"; exit 1;;
+esac
+
 if test ! -f Makefile ; then
 	test -f Makefile.PL && ../$depth/miniperl -I../$depth/lib Makefile.PL
 fi
@@ -65,10 +73,12 @@ if test ! -f Makefile ; then
 	test -f Makefile.SH && sh Makefile.SH
 fi
 
-make=${altmake-make}
-
-$make config
+case "$target" in
+clean)		;;
+realclean)	;;
+*)		$make config $passthru;;
+esac
 
-$make $linktype $makeargs
+$make $target $makeargs $passthru || exit
 
 exit $?