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.

29 files changed, 1584 insertions, 2722 deletions

diff --git a/MANIFEST b/MANIFEST
index d06638a999..f42df72a40 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -83,11 +83,11 @@ embed_h.SH		Produces embed.h
 ext/DB_File/DB_File.pm		Berkeley DB extension Perl module
 ext/DB_File/DB_File.xs		Berkeley DB extension external subroutines
 ext/DB_File/DB_File_BS		Berkeley DB extension mkbootstrap fodder
-ext/DB_File/Makefile.SH		Berkeley DB extension makefile writer
+ext/DB_File/Makefile.PL		Berkeley DB extension makefile writer
 ext/DB_File/typemap		Berkeley DB extension interface types
 ext/DynaLoader/DynaLoader.doc	Dynamic Loader specification
 ext/DynaLoader/DynaLoader.pm	Dynamic Loader perl module
-ext/DynaLoader/Makefile.SH	Dynamic Loader makefile writer
+ext/DynaLoader/Makefile.PL	Dynamic Loader makefile writer
 ext/DynaLoader/README		Dynamic Loader notes and intro
 ext/DynaLoader/dl_aix.xs	AIX implementation
 ext/DynaLoader/dl_dld.xs	GNU dld style implementation
@@ -100,29 +100,29 @@ ext/DynaLoader/dlutils.c	Dynamic loader utilities for dl_*.xs files
 ext/Fcntl/Fcntl.pm		Fcntl extension Perl module
 ext/Fcntl/Fcntl.xs		Fcntl extension external subroutines
 ext/Fcntl/MANIFEST		Fcntl extension file list
-ext/Fcntl/Makefile.SH		Fcntl extension makefile writer
+ext/Fcntl/Makefile.PL		Fcntl extension makefile writer
 ext/GDBM_File/GDBM_File.pm	GDBM extension Perl module
 ext/GDBM_File/GDBM_File.xs	GDBM extension external subroutines
-ext/GDBM_File/Makefile.SH	GDBM extension makefile writer
+ext/GDBM_File/Makefile.PL	GDBM extension makefile writer
 ext/GDBM_File/typemap		GDBM extension interface types
-ext/NDBM_File/Makefile.SH	NDBM extension makefile writer
+ext/NDBM_File/Makefile.PL	NDBM extension makefile writer
 ext/NDBM_File/NDBM_File.pm	NDBM extension Perl module
 ext/NDBM_File/NDBM_File.xs	NDBM extension external subroutines
 ext/NDBM_File/typemap		NDBM extension interface types
-ext/ODBM_File/Makefile.SH	ODBM extension makefile writer
+ext/ODBM_File/Makefile.PL	ODBM extension makefile writer
 ext/ODBM_File/ODBM_File.pm	ODBM extension Perl module
 ext/ODBM_File/ODBM_File.xs	ODBM extension external subroutines
 ext/ODBM_File/typemap		ODBM extension interface types
-ext/POSIX/Makefile.SH		POSIX extension makefile writer
+ext/POSIX/Makefile.PL		POSIX extension makefile writer
 ext/POSIX/POSIX.pm		POSIX extension Perl module
 ext/POSIX/POSIX.xs		POSIX extension external subroutines
 ext/POSIX/typemap		POSIX extension interface types
-ext/SDBM_File/Makefile.SH	SDBM extension makefile writer
+ext/SDBM_File/Makefile.PL	SDBM extension makefile writer
 ext/SDBM_File/SDBM_File.pm	SDBM extension Perl module
 ext/SDBM_File/SDBM_File.xs	SDBM extension external subroutines
 ext/SDBM_File/sdbm/CHANGES		SDBM kit
 ext/SDBM_File/sdbm/COMPARE		SDBM kit
-ext/SDBM_File/sdbm/Makefile.SH		SDBM kit
+ext/SDBM_File/sdbm/Makefile.PL		SDBM kit
 ext/SDBM_File/sdbm/README		SDBM kit
 ext/SDBM_File/sdbm/README.too		SDBM kit
 ext/SDBM_File/sdbm/biblio		SDBM kit
@@ -147,11 +147,11 @@ ext/SDBM_File/sdbm/sdbm.h		SDBM kit
 ext/SDBM_File/sdbm/tune.h		SDBM kit
 ext/SDBM_File/sdbm/util.c		SDBM kit
 ext/SDBM_File/typemap	SDBM extension interface types
-ext/Socket/Makefile.SH	Socket extension makefile writer
+ext/Socket/Makefile.PL	Socket extension makefile writer
 ext/Socket/Socket.pm	Socket extension Perl module
 ext/Socket/Socket.xs	Socket extension external subroutines
 ext/typemap		Extension interface types
-ext/util/extliblist	Used by extension Makefile.SH to make lib lists
+ext/util/extliblist	Used by extension Makefile.PL to make lib lists
 ext/util/make_ext	Used by Makefile to execute extension Makefiles
 ext/util/mkbootstrap	Turns ext/*/*_BS into bootstrap info
 ext/xsubpp		External subroutine preprocessor
diff --git a/Makefile.SH b/Makefile.SH
index e1e666d883..3562976615 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -285,30 +285,25 @@ s_dummy $(static_ext):	miniperl preplibrary $(DYNALOADER) FORCE
 	@sh ext/util/make_ext static $@
 
 clean:
-	rm -f *.o *.a all perl suidperl miniperl
-	rm -f perlmain.c
+	rm -f *.o *.a all perlmain.c
 	rm -f perl.exp ext.libs ext/util/extlibist
 	-cd x2p; $(MAKE) clean
 	-cd pod; $(MAKE) clean
-	-@for x in ext/* ; do \
-	if test -f $$x/Makefile; then \
-	echo "	Making clean in $$x"; \
-	cd $$x; $(MAKE) clean ; cd ../.. ; \
-	fi ; \
+	@for x in $(dynamic_ext) $(static_ext) ; do \
+	sh ext/util/make_ext clean $$x ; \
 	done
+	rm -f perl suidperl miniperl
 
 realclean: clean
 	-cd x2p; $(MAKE) realclean
-	-@for x in ext/* ; do \
-	if test -f $$x/Makefile; then \
-	echo "	Making realclean in $$x"; \
-	cd $$x; $(MAKE) realclean ; cd ../.. ; \
-	fi ; \
+	: could add: "-cd pod; $(MAKE) realclean" here and to pod/Makefile
+	@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) ; do \
+	sh ext/util/make_ext realclean $$x ; \
 	done
-	rm -f *.orig */*.orig *~ */*~ core t/core
+	rm -f *.orig */*.orig *~ */*~ core t/core t/c t/perl
 	rm -rf $(addedbyconf)
 	rm -f Makefile cflags makedepend makedir writemain
-	rm -f config.h t/perl makefile makefile.old
+	rm -f config.h makefile makefile.old
 	rm -f x2p/Makefile x2p/makefile x2p/makefile.old x2p/cflags
 	rm -f lib/Config.pm
 	rm -rf lib/auto
diff --git a/ext/DB_File/Makefile.PL b/ext/DB_File/Makefile.PL
new file mode 100644
index 0000000000..7100ce671a
--- /dev/null
+++ b/ext/DB_File/Makefile.PL
@@ -0,0 +1,2 @@
+use ExtUtils::MakeMaker;
+WriteMakefile(LIBS => ["-ldb"]);
diff --git a/ext/DB_File/Makefile.SH b/ext/DB_File/Makefile.SH
deleted file mode 100644
index 7422b00eab..0000000000
--- a/ext/DB_File/Makefile.SH
+++ /dev/null
@@ -1,207 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-potential_libs="-ldb "
-. $TOP/ext/util/extliblist
-
-: This extension might need bootstrap support
-if test -f ${ext}_BS; then
-	bootdep=${ext}_BS
-else
-	bootdep=''
-fi
-
-case "$dlsrc" in
-dl_aix*)
-    echo "#!" > $ext.exp
-    echo "boot_$ext" >> $ext.exp
-    ;;
-esac
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# $ext might have its own bootstrap support
-BOOTDEP  = $bootdep
-BOOTSTRAP  = $ext.bs
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-DLEXT = $dlext
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLBOOT = $(AUTO)/$(EXT)/$(EXT).bs
-INSTALLDYNAMIC = $(AUTO)/$(EXT)/$(EXT).$(DLEXT)
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	dynamic
-# Phony target to force checking subdirectories.
-FORCE:
-
-config:
-
-# Target for Dynamic Loading:
-dynamic:	$(INSTALLDYNAMIC) $(INSTALLPM) $(INSTALLBOOT)
-
-$(INSTALLDYNAMIC): $(EXT).o
-	@test -d $(AUTO) || mkdir $(AUTO)
-	@test -d $(AUTO)/$(EXT) || mkdir $(AUTO)/$(EXT)
-	ld $(LDDLFLAGS) -o $@ $(EXT).o $(STATLOADLIBS)
-
-$(BOOTSTRAP):	Makefile $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib $(TOP)/ext/util/mkbootstrap $(DYNALOADLIBS)
-	touch $(BOOTSTRAP)
-
-$(INSTALLBOOT):	$(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o
-	ar cr $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(EXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(EXT).xs >tmp
-	mv tmp $@
-
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-
-clean:
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP) $(EXT).exp
-
-realclean: 	clean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLDYNAMIC) $(INSTALLSTATIC) $(INSTALLBOOT)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
-
diff --git a/ext/DynaLoader/DynaLoader.pm b/ext/DynaLoader/DynaLoader.pm
index 61d9a8566e..6bf0062d12 100644
--- a/ext/DynaLoader/DynaLoader.pm
+++ b/ext/DynaLoader/DynaLoader.pm
@@ -112,12 +112,11 @@ sub bootstrap {
     # The .bs file can be used to configure @dl_resolve_using etc to
     # match the needs of the individual module on this architecture.
     my $bs = $file;
-    $bs =~ s/\.$dl_dlext$/\.bs/o; # look for .bs 'beside' the library
-    if (-f $bs) {
+    $bs =~ s/(\.\w+)?$/\.bs/; # look for .bs 'beside' the library
+    if (-s $bs) { # only read file if it's not empty
         local($osname, $dlsrc) = @Config{'osname','dlsrc'};
-        print STDERR "$bs ($osname, $dlsrc)\n" if $dl_debug;
-        $@ = "";
-        do $bs;
+        print STDERR "BS: $bs ($osname, $dlsrc)\n" if $dl_debug;
+        eval { do $bs; };
         warn "$bs: $@\n" if $@;
     }
 
diff --git a/ext/DynaLoader/Makefile.PL b/ext/DynaLoader/Makefile.PL
new file mode 100644
index 0000000000..6ce9527061
--- /dev/null
+++ b/ext/DynaLoader/Makefile.PL
@@ -0,0 +1,24 @@
+use ExtUtils::MakeMaker;
+
+WriteMakefile(
+    'LINKTYPE'	=> 'static',
+    'DEFINE'	=> '-DLIBC="$(LIBC)"',
+    'SKIP'	=> [qw(dynamic dynamic_lib dynamic_bs)],
+    'clean'	=> {FILES => 'DynaLoader.c'},
+);
+
+
+sub MY::postamble {
+	'
+DynaLoader.c: $(DLSRC)
+	$(PERL) $(XSUBPP) $(XSUBPPARGS) $(DLSRC) >tmp && mv tmp $@
+
+# Perform very simple tests just to check for major gaffs.
+# We can\'t do much more for platforms we are not executing on.
+test-xs:
+	for i in dl_*xs; \
+	    do $(PERL) $(XSUBPP) $(XSUBPPARGS) $$i > /dev/null; \
+	done
+';
+}
+
diff --git a/ext/DynaLoader/Makefile.SH b/ext/DynaLoader/Makefile.SH
deleted file mode 100644
index 2b10fefd1a..0000000000
--- a/ext/DynaLoader/Makefile.SH
+++ /dev/null
@@ -1,185 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-potential_libs=""
-. $TOP/ext/util/extliblist
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-
-DLSRC = $dlsrc
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-DLEXT = $dlext
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	static
-# Phony target to force checking subdirectories.
-FORCE:
-
-config:
-
-# Target for Dynamic Loading:
-# If we hit here, there's a mistake somewhere.
-dynamic:	static
-	@echo "The DynaLoader extension must be built for static linking"
-	false
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o
-	ar cr $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(DLSRC) dlutils.c $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(DLSRC) >tmp
-	mv tmp $@
-
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-
-# Perform very simple tests just to check for major gaffs.
-# We can't do much more for platforms we are not executing on.
-test-xs:
-	for i in dl_*xs; do $(PERL) $(XSUBPP) $$i > /dev/null; done
-
-clean:
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP)
-
-realclean: 	clean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLSTATIC)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
-
diff --git a/ext/Fcntl/Makefile.PL b/ext/Fcntl/Makefile.PL
new file mode 100644
index 0000000000..414df14f22
--- /dev/null
+++ b/ext/Fcntl/Makefile.PL
@@ -0,0 +1,2 @@
+use ExtUtils::MakeMaker;
+WriteMakefile();
diff --git a/ext/Fcntl/Makefile.SH b/ext/Fcntl/Makefile.SH
deleted file mode 100644
index 064228e512..0000000000
--- a/ext/Fcntl/Makefile.SH
+++ /dev/null
@@ -1,207 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-potential_libs=" "
-. $TOP/ext/util/extliblist
-
-: This extension might need bootstrap support
-if test -f ${ext}_BS; then
-	bootdep=${ext}_BS
-else
-	bootdep=''
-fi
-
-case "$dlsrc" in
-dl_aix*)
-    echo "#!" > $ext.exp
-    echo "boot_$ext" >> $ext.exp
-    ;;
-esac
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# $ext might have its own bootstrap support
-BOOTDEP  = $bootdep
-BOOTSTRAP  = $ext.bs
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-DLEXT = $dlext
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLBOOT = $(AUTO)/$(EXT)/$(EXT).bs
-INSTALLDYNAMIC = $(AUTO)/$(EXT)/$(EXT).$(DLEXT)
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	dynamic
-# Phony target to force checking subdirectories.
-FORCE:
-
-config:
-
-# Target for Dynamic Loading:
-dynamic:	$(INSTALLDYNAMIC) $(INSTALLPM) $(INSTALLBOOT)
-
-$(INSTALLDYNAMIC): $(EXT).o
-	@test -d $(AUTO) || mkdir $(AUTO)
-	@test -d $(AUTO)/$(EXT) || mkdir $(AUTO)/$(EXT)
-	ld $(LDDLFLAGS) -o $@ $(EXT).o $(STATLOADLIBS)
-
-$(BOOTSTRAP):	Makefile $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib $(TOP)/ext/util/mkbootstrap $(DYNALOADLIBS)
-	touch $(BOOTSTRAP)
-
-$(INSTALLBOOT):	$(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o
-	ar cr $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(EXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(EXT).xs >tmp
-	mv tmp $@
-
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-
-clean:
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP) $(EXT).exp
-
-realclean: 	clean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLDYNAMIC) $(INSTALLSTATIC) $(INSTALLBOOT)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
-
diff --git a/ext/GDBM_File/Makefile.PL b/ext/GDBM_File/Makefile.PL
new file mode 100644
index 0000000000..bd91b80f5e
--- /dev/null
+++ b/ext/GDBM_File/Makefile.PL
@@ -0,0 +1,2 @@
+use ExtUtils::MakeMaker;
+WriteMakefile(LIBS => ["-lgdbm", "-ldbm"]);
diff --git a/ext/GDBM_File/Makefile.SH b/ext/GDBM_File/Makefile.SH
deleted file mode 100644
index 974c8deef8..0000000000
--- a/ext/GDBM_File/Makefile.SH
+++ /dev/null
@@ -1,213 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-potential_libs="-lgdbm"
-. $TOP/ext/util/extliblist
-case "${extralibs}${dynaloadlibs}${statloadlibs}" in
-'') : Try again.  Maybe they have -ldbm instead
-	potential_libs='-ldbm'
-	. $TOP/ext/util/extliblist
-	;;
-esac
-
-: This extension might need bootstrap support
-if test -f ${ext}_BS; then
-	bootdep=${ext}_BS
-else
-	bootdep=''
-fi
-
-case "$dlsrc" in
-dl_aix*)
-    echo "#!" > $ext.exp
-    echo "boot_$ext" >> $ext.exp
-    ;;
-esac
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# $ext might have its own bootstrap support
-BOOTDEP  = $bootdep
-BOOTSTRAP  = $ext.bs
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-DLEXT = $dlext
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLBOOT = $(AUTO)/$(EXT)/$(EXT).bs
-INSTALLDYNAMIC = $(AUTO)/$(EXT)/$(EXT).$(DLEXT)
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	dynamic
-# Phony target to force checking subdirectories.
-FORCE:
-
-config:
-
-# Target for Dynamic Loading:
-dynamic:	$(INSTALLDYNAMIC) $(INSTALLPM) $(INSTALLBOOT)
-
-$(INSTALLDYNAMIC): $(EXT).o
-	@test -d $(AUTO) || mkdir $(AUTO)
-	@test -d $(AUTO)/$(EXT) || mkdir $(AUTO)/$(EXT)
-	ld $(LDDLFLAGS) -o $@ $(EXT).o $(STATLOADLIBS)
-
-$(BOOTSTRAP):	Makefile $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib $(TOP)/ext/util/mkbootstrap $(DYNALOADLIBS)
-	touch $(BOOTSTRAP)
-
-$(INSTALLBOOT):	$(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o
-	ar cr $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(EXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(EXT).xs >tmp
-	mv tmp $@
-
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-
-clean:
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP) $(EXT).exp
-
-realclean: 	clean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLDYNAMIC) $(INSTALLSTATIC) $(INSTALLBOOT)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
-
diff --git a/ext/NDBM_File/Makefile.PL b/ext/NDBM_File/Makefile.PL
new file mode 100644
index 0000000000..b334525212
--- /dev/null
+++ b/ext/NDBM_File/Makefile.PL
@@ -0,0 +1,2 @@
+use ExtUtils::MakeMaker;
+WriteMakefile(LIBS => ["-lndbm", "-ldbm"]);
diff --git a/ext/NDBM_File/Makefile.SH b/ext/NDBM_File/Makefile.SH
deleted file mode 100644
index 56016cae03..0000000000
--- a/ext/NDBM_File/Makefile.SH
+++ /dev/null
@@ -1,213 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-potential_libs="-lndbm"
-. $TOP/ext/util/extliblist
-case "${extralibs}${dynaloadlibs}${statloadlibs}" in
-'') : Try again.  Maybe they have -ldbm instead
-	potential_libs='-ldbm'
-	. $TOP/ext/util/extliblist
-	;;
-esac
-
-: This extension might need bootstrap support
-if test -f ${ext}_BS; then
-	bootdep=${ext}_BS
-else
-	bootdep=''
-fi
-
-case "$dlsrc" in
-dl_aix*)
-    echo "#!" > $ext.exp
-    echo "boot_$ext" >> $ext.exp
-    ;;
-esac
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# $ext might have its own bootstrap support
-BOOTDEP  = $bootdep
-BOOTSTRAP  = $ext.bs
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-DLEXT = $dlext
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLBOOT = $(AUTO)/$(EXT)/$(EXT).bs
-INSTALLDYNAMIC = $(AUTO)/$(EXT)/$(EXT).$(DLEXT)
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	dynamic
-# Phony target to force checking subdirectories.
-FORCE:
-
-config:
-
-# Target for Dynamic Loading:
-dynamic:	$(INSTALLDYNAMIC) $(INSTALLPM) $(INSTALLBOOT)
-
-$(INSTALLDYNAMIC): $(EXT).o
-	@test -d $(AUTO) || mkdir $(AUTO)
-	@test -d $(AUTO)/$(EXT) || mkdir $(AUTO)/$(EXT)
-	ld $(LDDLFLAGS) -o $@ $(EXT).o $(STATLOADLIBS)
-
-$(BOOTSTRAP):	Makefile $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib $(TOP)/ext/util/mkbootstrap $(DYNALOADLIBS)
-	touch $(BOOTSTRAP)
-
-$(INSTALLBOOT):	$(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o
-	ar cr $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(EXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(EXT).xs >tmp
-	mv tmp $@
-
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-
-clean:
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP) $(EXT).exp
-
-realclean: 	clean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLDYNAMIC) $(INSTALLSTATIC) $(INSTALLBOOT)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
-
diff --git a/ext/ODBM_File/Makefile.PL b/ext/ODBM_File/Makefile.PL
new file mode 100644
index 0000000000..a25faace3b
--- /dev/null
+++ b/ext/ODBM_File/Makefile.PL
@@ -0,0 +1,2 @@
+use ExtUtils::MakeMaker;
+WriteMakefile(LIBS => ["-ldbm.nfs", "-ldbm"]);
diff --git a/ext/ODBM_File/Makefile.SH b/ext/ODBM_File/Makefile.SH
deleted file mode 100644
index 02cf6e13ab..0000000000
--- a/ext/ODBM_File/Makefile.SH
+++ /dev/null
@@ -1,213 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-: dbm.nfs is an SCO library.
-potential_libs="-ldbm.nfs"
-. $TOP/ext/util/extliblist
-case "${extralibs}${dynaloadlibs}${statloadlibs}" in
-'') : Try again.  Most systems have -ldbm instead
-    potential_libs='-ldbm'
-    . $TOP/ext/util/extliblist
-    ;;
-esac
-
-: This extension might need bootstrap support
-if test -f ${ext}_BS; then
-	bootdep=${ext}_BS
-else
-	bootdep=''
-fi
-
-case "$dlsrc" in
-dl_aix*)
-    echo "#!" > $ext.exp
-    echo "boot_$ext" >> $ext.exp
-    ;;
-esac
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# $ext might have its own bootstrap support
-BOOTDEP  = $bootdep
-BOOTSTRAP  = $ext.bs
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-DLEXT = $dlext
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLBOOT = $(AUTO)/$(EXT)/$(EXT).bs
-INSTALLDYNAMIC = $(AUTO)/$(EXT)/$(EXT).$(DLEXT)
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	dynamic
-# Phony target to force checking subdirectories.
-FORCE:
-
-config:
-
-# Target for Dynamic Loading:
-dynamic:	$(INSTALLDYNAMIC) $(INSTALLPM) $(INSTALLBOOT)
-
-$(INSTALLDYNAMIC): $(EXT).o
-	@test -d $(AUTO) || mkdir $(AUTO)
-	@test -d $(AUTO)/$(EXT) || mkdir $(AUTO)/$(EXT)
-	ld $(LDDLFLAGS) -o $@ $(EXT).o $(STATLOADLIBS)
-
-$(BOOTSTRAP):	Makefile $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib $(TOP)/ext/util/mkbootstrap $(DYNALOADLIBS)
-	touch $(BOOTSTRAP)
-
-$(INSTALLBOOT):	$(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o
-	ar cr $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(EXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(EXT).xs >tmp
-	mv tmp $@
-
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-
-clean:
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP) $(EXT).exp
-
-realclean: 	clean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLDYNAMIC) $(INSTALLSTATIC) $(INSTALLBOOT)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
diff --git a/ext/POSIX/Makefile.PL b/ext/POSIX/Makefile.PL
new file mode 100644
index 0000000000..3717a0a2a7
--- /dev/null
+++ b/ext/POSIX/Makefile.PL
@@ -0,0 +1,2 @@
+use ExtUtils::MakeMaker;
+WriteMakefile(LIBS => ["-lm -lposix -lcposix"]);
diff --git a/ext/POSIX/Makefile.SH b/ext/POSIX/Makefile.SH
deleted file mode 100644
index 13a8faa116..0000000000
--- a/ext/POSIX/Makefile.SH
+++ /dev/null
@@ -1,207 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-potential_libs="-lm -lposix -lcposix "
-. $TOP/ext/util/extliblist
-
-: This extension might need bootstrap support
-if test -f ${ext}_BS; then
-	bootdep=${ext}_BS
-else
-	bootdep=''
-fi
-
-case "$dlsrc" in
-dl_aix*)
-    echo "#!" > $ext.exp
-    echo "boot_$ext" >> $ext.exp
-    ;;
-esac
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# $ext might have its own bootstrap support
-BOOTDEP  = $bootdep
-BOOTSTRAP  = $ext.bs
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-DLEXT = $dlext
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLBOOT = $(AUTO)/$(EXT)/$(EXT).bs
-INSTALLDYNAMIC = $(AUTO)/$(EXT)/$(EXT).$(DLEXT)
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	dynamic
-# Phony target to force checking subdirectories.
-FORCE:
-
-config:
-
-# Target for Dynamic Loading:
-dynamic:	$(INSTALLDYNAMIC) $(INSTALLPM) $(INSTALLBOOT)
-
-$(INSTALLDYNAMIC): $(EXT).o
-	@test -d $(AUTO) || mkdir $(AUTO)
-	@test -d $(AUTO)/$(EXT) || mkdir $(AUTO)/$(EXT)
-	ld $(LDDLFLAGS) -o $@ $(EXT).o $(STATLOADLIBS)
-
-$(BOOTSTRAP):	Makefile $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib $(TOP)/ext/util/mkbootstrap $(DYNALOADLIBS)
-	touch $(BOOTSTRAP)
-
-$(INSTALLBOOT):	$(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o
-	ar cr $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(EXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(EXT).xs >tmp
-	mv tmp $@
-
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-
-clean:
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP) $(EXT).exp
-
-realclean: 	clean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLDYNAMIC) $(INSTALLSTATIC) $(INSTALLBOOT)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
-
diff --git a/ext/SDBM_File/Makefile.PL b/ext/SDBM_File/Makefile.PL
new file mode 100644
index 0000000000..17c16b104b
--- /dev/null
+++ b/ext/SDBM_File/Makefile.PL
@@ -0,0 +1,19 @@
+use ExtUtils::MakeMaker;
+
+# The existence of the ./sdbm/Makefile.PL file causes MakeMaker
+# to automatically include Makefile code for the targets
+#	config, all, clean, realclean and sdbm/Makefile
+# which perform the corresponding actions in the subdirectory.
+
+WriteMakefile(
+    'MYEXTLIB' => 'sdbm/libsdbm.a',
+);
+
+
+sub MY::postamble {
+    '
+$(MYEXTLIB): sdbm/Makefile
+	cd sdbm; $(MAKE) all
+';
+}
+
diff --git a/ext/SDBM_File/Makefile.SH b/ext/SDBM_File/Makefile.SH
deleted file mode 100644
index 1f181e3b09..0000000000
--- a/ext/SDBM_File/Makefile.SH
+++ /dev/null
@@ -1,216 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-potential_libs=" "
-. $TOP/ext/util/extliblist
-
-: This extension might need bootstrap support
-if test -f ${ext}_BS; then
-	bootdep=${ext}_BS
-else
-	bootdep=''
-fi
-
-case "$dlsrc" in
-dl_aix*)
-    echo "#!" > $ext.exp
-    echo "boot_$ext" >> $ext.exp
-    ;;
-esac
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# $ext might have its own bootstrap support
-BOOTDEP  = $bootdep
-BOOTSTRAP  = $ext.bs
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-DLEXT = $dlext
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLBOOT = $(AUTO)/$(EXT)/$(EXT).bs
-INSTALLDYNAMIC = $(AUTO)/$(EXT)/$(EXT).$(DLEXT)
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	dynamic
-# Phony target to force checking subdirectories.
-FORCE:
-
-config:
-
-# Target for Dynamic Loading:
-dynamic:	$(INSTALLDYNAMIC) $(INSTALLPM) $(INSTALLBOOT)
-
-$(INSTALLDYNAMIC): $(EXT).o sdbm/libsdbm.a
-	@test -d $(AUTO) || mkdir $(AUTO)
-	@test -d $(AUTO)/$(EXT) || mkdir $(AUTO)/$(EXT)
-	ld $(LDDLFLAGS) -o $@ $(EXT).o sdbm/libsdbm.a $(STATLOADLIBS)
-
-$(BOOTSTRAP):	Makefile $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib $(TOP)/ext/util/mkbootstrap $(DYNALOADLIBS)
-	touch $(BOOTSTRAP)
-
-$(INSTALLBOOT):	$(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o sdbm/libsdbm.a
-	cp sdbm/libsdbm.a $@
-	ar r $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(EXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(EXT).xs >tmp
-	mv tmp $@
-
-sdbm/libsdbm.a:	FORCE
-	@cd sdbm;  \
-	if test ! -f Makefile ; then \
-	test -f Makefile.SH && sh Makefile.SH ; \
-	fi ; 	$(MAKE)
-
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-
-clean:
-	-cd sdbm; $(MAKE) clean
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP) $(EXT).exp
-
-realclean: 	clean
-	-cd sdbm; $(MAKE) realclean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLDYNAMIC) $(INSTALLSTATIC) $(INSTALLBOOT)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
-
diff --git a/ext/SDBM_File/sdbm/Makefile.PL b/ext/SDBM_File/sdbm/Makefile.PL
new file mode 100644
index 0000000000..1994f052b4
--- /dev/null
+++ b/ext/SDBM_File/sdbm/Makefile.PL
@@ -0,0 +1,49 @@
+use ExtUtils::MakeMaker;
+WriteMakefile(
+    'LINKTYPE'  => 'static',
+    'DEFINE'	=> '-DSDBM -DDUFF',
+    'SKIP'	=> [qw(static static_lib dynamic dynamic_lib)],
+    'clean'
+	=> {'FILES' => 'dbu libsdbm.a dbd dba dbe x-dbu *.dir *.pag'}
+);
+
+
+sub MY::top_targets {
+	'
+LIBOBJS = sdbm.o pair.o hash.o
+LIBSRCS = sdbm.c pair.c hash.c
+HDRS = tune.h sdbm.h pair.h
+
+all :: static
+
+static ::	libsdbm.a
+
+libsdbm.a: $(LIBOBJS)
+	ar cr libsdbm.a $(LIBOBJS)
+	$(RANLIB) libsdbm.a
+
+$(LIBOBJS): $(HDRS) $(PERL_INC)/config.h
+
+config ::
+
+lint:
+	lint -abchx $(LIBSRCS)
+';
+}
+
+
+sub MY::realclean {
+	'
+realclean :: clean
+	rm -f Makefile
+';
+}
+
+
+sub MY::postamble {
+	'
+sdbm.o : sdbm.c $(PERL_INC)/config.h sdbm.h tune.h pair.h 
+hash.o : hash.c $(PERL_INC)/config.h sdbm.h 
+pair.o : pair.c $(PERL_INC)/config.h sdbm.h tune.h pair.h 
+';
+}
diff --git a/ext/SDBM_File/sdbm/Makefile.SH b/ext/SDBM_File/sdbm/Makefile.SH
deleted file mode 100644
index 521c97270a..0000000000
--- a/ext/SDBM_File/sdbm/Makefile.SH
+++ /dev/null
@@ -1,99 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-echo "Extracting ext/SDBM_File/sdbm/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile <<!GROK!THIS!
-#
-# This Makefile is for the library part of sdbm.  For the
-# Full package, see makefile.sdbm.
-# 
-# Makefile for public domain ndbm-clone: sdbm
-# DUFF: use duff's device (loop unroll) in parts of the code
-#
-#
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-
-!GROK!THIS!
-
-: In the following dollars and backticks do not need the extra backslash.
-$spitshell >>Makefile <<'!NO!SUBS!'
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) -DSDBM -DDUFF $*.c
-
-LIBOBJS = sdbm.o pair.o hash.o
-LIBSRCS = sdbm.c pair.c hash.c
-HDRS = tune.h sdbm.h pair.h $(TOP)/config.h
-
-all:	libsdbm.a
-
-libsdbm.a: $(LIBOBJS)
-	ar cr libsdbm.a $(LIBOBJS)
-	$(RANLIB) libsdbm.a
-
-$(LIBOBJS): $(HDRS)
-
-lint:
-	lint -abchx $(LIBSRCS)
-
-clean:
-	rm -f *.o *.a mon.out core
-
-realclean: 	clean
-	rm -f dbu libsdbm.a dbd dba dbe x-dbu *.dir *.pag
-	rm -f makefile Makefile
-
-purge:	realclean
-
-sdbm.o : sdbm.c $(TOP)/config.h sdbm.h tune.h pair.h 
-hash.o : hash.c $(TOP)/config.h sdbm.h 
-pair.o : pair.c $(TOP)/config.h sdbm.h tune.h pair.h 
-
-!NO!SUBS!
-chmod 755 Makefile
-$eunicefix Makefile
diff --git a/ext/Socket/Makefile.PL b/ext/Socket/Makefile.PL
new file mode 100644
index 0000000000..414df14f22
--- /dev/null
+++ b/ext/Socket/Makefile.PL
@@ -0,0 +1,2 @@
+use ExtUtils::MakeMaker;
+WriteMakefile();
diff --git a/ext/Socket/Makefile.SH b/ext/Socket/Makefile.SH
deleted file mode 100644
index 064228e512..0000000000
--- a/ext/Socket/Makefile.SH
+++ /dev/null
@@ -1,207 +0,0 @@
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-potential_libs=" "
-. $TOP/ext/util/extliblist
-
-: This extension might need bootstrap support
-if test -f ${ext}_BS; then
-	bootdep=${ext}_BS
-else
-	bootdep=''
-fi
-
-case "$dlsrc" in
-dl_aix*)
-    echo "#!" > $ext.exp
-    echo "boot_$ext" >> $ext.exp
-    ;;
-esac
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# $ext might have its own bootstrap support
-BOOTDEP  = $bootdep
-BOOTSTRAP  = $ext.bs
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-DLEXT = $dlext
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLBOOT = $(AUTO)/$(EXT)/$(EXT).bs
-INSTALLDYNAMIC = $(AUTO)/$(EXT)/$(EXT).$(DLEXT)
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	dynamic
-# Phony target to force checking subdirectories.
-FORCE:
-
-config:
-
-# Target for Dynamic Loading:
-dynamic:	$(INSTALLDYNAMIC) $(INSTALLPM) $(INSTALLBOOT)
-
-$(INSTALLDYNAMIC): $(EXT).o
-	@test -d $(AUTO) || mkdir $(AUTO)
-	@test -d $(AUTO)/$(EXT) || mkdir $(AUTO)/$(EXT)
-	ld $(LDDLFLAGS) -o $@ $(EXT).o $(STATLOADLIBS)
-
-$(BOOTSTRAP):	Makefile $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib $(TOP)/ext/util/mkbootstrap $(DYNALOADLIBS)
-	touch $(BOOTSTRAP)
-
-$(INSTALLBOOT):	$(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o
-	ar cr $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(EXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(EXT).xs >tmp
-	mv tmp $@
-
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-
-clean:
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP) $(EXT).exp
-
-realclean: 	clean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLDYNAMIC) $(INSTALLSTATIC) $(INSTALLBOOT)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
-
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 $?
diff --git a/h2xs b/h2xs
index 5baf61d8de..158e5e21c8 100755
--- a/h2xs
+++ b/h2xs
@@ -10,7 +10,6 @@ $usage='h2xs [-Aachfm] [-n module_name] [headerfile [extra_libraries]]
 	-c	Omit the constant() function from the XS file.
 	-A	Equivalent to -a -c 
 	-f	Force creation of the extension even if the C header does not exist.
-	-m	Also create an old-style Makefile.SH
 	-h 	help
 	-n	Specify a name to use for the extension.
 extra_libraries are any libraries that might be needed for loading
@@ -19,7 +18,7 @@ extra_libraries are any libraries that might be needed for loading
 
 sub usage{ die "Usage: $usage\n" }
 
-getopts("fhcaAmn:") || &usage;
+getopts("fhcaAn:") || &usage;
 
 &usage if $opt_h;
 
@@ -34,7 +33,6 @@ $extralibs = "@ARGV";
 if( $opt_A ){
 	$opt_a = $opt_c = 1;
 }
-$write_makefile_sh = ($opt_m) ? 1 : 0;
 
 if( $path_h ){
 	$name = $path_h;
@@ -258,252 +256,22 @@ close XS;
 warn "Writing ext/$modpname/Makefile.PL\n";
 open(PL, ">Makefile.PL") || die "Can't create ext/$modpname/Makefile.PL: $!\n";
 
-# Ideally this should have a #!../.. ... miniperl etc header
 print PL <<'END';
 use ExtUtils::MakeMaker;
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile being created.
+# the contents of the Makefile that is written.
 END
-print PL "&writeMakefile(\n";
-print PL "	'potential_libs' => '$extralibs',   # e.g., '-lm' \n";
-print PL "	'INC' => '',     # e.g., '-I/usr/include/other' \n";
-print PL "	'DISTNAME' => 'myname',\n";
-print PL "	'VERSION' => '0.1',\n";
+print PL "WriteMakefile(\n";
+print PL "    'NAME'	=> '$module',\n";
+print PL "    'VERSION'	=> '0.1',\n";
+print PL "    'LIBS'	=> ['$extralibs'],   # e.g., '-lm' \n";
+print PL "    'DEFINE'	=> '',     # e.g., '-DHAVE_SOMETHING' \n";
+print PL "    'INC'	=> '',     # e.g., '-I/usr/include/other' \n";
 print PL ");\n";
 }
 
-if ($write_makefile_sh){
-warn "Writing ext/$modpname/Makefile.SH\n";
-open(MF, ">Makefile.SH") || die "Can't create ext/$modpname/Makefile.SH: $!\n";
-print MF <<'END';
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-
-if test -f config.sh; then TOP=.;
-elif test -f ../config.sh; then TOP=..;
-elif test -f ../../config.sh; then TOP=../..;
-elif test -f ../../../config.sh; then TOP=../../..;
-elif test -f ../../../../config.sh; then TOP=../../../..;
-else
-	echo "Can't find config.sh."; exit 1
-fi
-
-: Find absolute path name for TOP.  This is needed when we cd to TOP
-: to run perl on autosplit.
-oldpwd=`pwd`; cd $TOP; ABSTOP=`pwd`; cd $oldpwd
-
-case $CONFIG in
-'')
-	. $TOP/config.sh
-	;;
-esac
-
-: Find out directory name.  This is also the extension name.
-ext=`pwd | $sed -e 's@.*/@@'`
-
-: This extension might have its own typemap
-if test -f typemap; then
-	exttypemap='typemap'
-else
-	exttypemap=''
-fi
-
-: This extension might need additional libraries.
-END
-print MF "potential_libs=\"$extralibs\"\n";
-print MF <<'END';
-. $TOP/ext/util/extliblist
-
-: This extension might need bootstrap support
-if test -f ${ext}_BS; then
-	bootdep=${ext}_BS
-else
-	bootdep=''
-fi
-
-case "$dlsrc" in
-dl_aix*)
-    echo "#!" > $ext.exp
-    echo "boot_$ext" >> $ext.exp
-    ;;
-esac
-
-echo "Extracting ext/$ext/Makefile (with variable substitutions)"
-: This section of the file will have variable substitutions done on it.
-: Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!.
-: Protect any dollar signs and backticks that you do not want interpreted
-: by putting a backslash in front.  You may delete these comments.
-$spitshell >Makefile << !GROK!THIS!
-#
-# This Makefile is for the $ext extension to perl.
-# 
-CC = $cc
-RANLIB = $ranlib
-TOP = $TOP
-ABSTOP = $ABSTOP
-LDFLAGS = $ldflags
-CLDFLAGS = $ldflags
-SMALL = $small
-LARGE = $large $split
-
-# To use an alternate make, set \\$altmake in config.sh.
-MAKE = ${altmake-make}
-
-EXT = $ext
-
-# $ext might have its own typemap
-EXTTYPEMAP = $exttypemap
-
-# $ext might have its own bootstrap support
-BOOTDEP  = $bootdep
-BOOTSTRAP  = $ext.bs
-
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $lddlflags
-CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
-SO = $so
-
-# $ext might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNLOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $extralibs
-DYNALOADLIBS  = $dynaloadlibs
-STATLOADLIBS = $statloadlibs
-
-!GROK!THIS!
-
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-# Where to put things:
-AUTO = $(TOP)/lib/auto
-INSTALLBOOT = $(AUTO)/$(EXT)/$(EXT).bs
-INSTALLDYNAMIC = $(AUTO)/$(EXT)/$(EXT).$(SO)
-INSTALLSTATIC = $(EXT).a
-INSTALLPM = $(TOP)/lib/$(EXT).pm
-
-PERL = $(ABSTOP)/miniperl
-XSUBPP = $(TOP)/ext/xsubpp
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(TOP)/cflags $@`
-
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) -I$(TOP) $*.c
-
-all:	dynamic
-# Phony target to force checking subdirectories.
-FORCE:
-
-# Target for Dynamic Loading:
-dynamic:	$(INSTALLDYNAMIC) $(INSTALLPM) $(INSTALLBOOT)
-
-$(INSTALLDYNAMIC): $(EXT).o
-	@test -d $(AUTO) || mkdir $(AUTO)
-	@test -d $(AUTO)/$(EXT) || mkdir $(AUTO)/$(EXT)
-	ld $(LDDLFLAGS) -o $@ $(EXT).o $(STATLOADLIBS)
-
-$(BOOTSTRAP):	Makefile $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib $(TOP)/ext/util/mkbootstrap $(DYNALOADLIBS)
-	touch $(BOOTSTRAP)
-
-$(INSTALLBOOT):	$(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
-
-# Target for Static Loading:
-static: $(INSTALLSTATIC) $(INSTALLPM)
-
-$(INSTALLSTATIC):	$(EXT).o
-	ar cr $@ $(EXT).o
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
-
-$(EXT).c:	$(EXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags Makefile
-	$(PERL) $(XSUBPP) $(EXT).xs >tmp
-	mv tmp $@
-
-END
-if( ! $opt_a ){
-print MF <<'END';
-$(INSTALLPM):	$(EXT).pm
-	rm -f $@
-	cp $(EXT).pm $@
-	cd $(TOP); $(PERL) autosplit $(EXT)
-END
-}
-else {
-print MF <<'END';
-$(INSTALLPM):	$(EXT).pm
-	cp $(EXT).pm $@
-END
-}
-print MF <<'END';
-
-clean:
-	rm -f *.o *.a mon.out core $(EXT).c so_locations $(BOOTSTRAP) $(EXT).exp
-
-realclean: 	clean
-	rm -f makefile Makefile
-	rm -f $(INSTALLPM) $(INSTALLDYNAMIC) $(INSTALLSTATIC) $(INSTALLBOOT)
-	rm -rf $(AUTO)/$(EXT)
-
-purge:	realclean
-
-$(EXT).o :	$(TOP)/EXTERN.h
-$(EXT).o :	$(TOP)/perl.h
-$(EXT).o :	$(TOP)/embed.h
-$(EXT).o :	$(TOP)/config.h
-$(EXT).o :	$(TOP)/unixish.h
-$(EXT).o :	$(TOP)/handy.h
-$(EXT).o :	$(TOP)/regexp.h
-$(EXT).o :	$(TOP)/sv.h
-$(EXT).o :	$(TOP)/util.h
-$(EXT).o :	$(TOP)/form.h
-$(EXT).o :	$(TOP)/gv.h
-$(EXT).o :	$(TOP)/cv.h
-$(EXT).o :	$(TOP)/opcode.h
-$(EXT).o :	$(TOP)/op.h
-$(EXT).o :	$(TOP)/cop.h
-$(EXT).o :	$(TOP)/av.h
-$(EXT).o :	$(TOP)/hv.h
-$(EXT).o :	$(TOP)/mg.h
-$(EXT).o :	$(TOP)/scope.h
-$(EXT).o :	$(TOP)/pp.h
-$(EXT).o :	$(TOP)/proto.h
-$(EXT).o :	$(TOP)/XSUB.h 
-
-Makefile:	Makefile.SH $(TOP)/config.sh ; /bin/sh Makefile.SH
-$(TOP)/config.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h:	$(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:	$(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-!NO!SUBS!
-chmod 755 Makefile
-$eunicefix Makefile
-
-END
-close MF;
-}
-
 system '/bin/ls > MANIFEST';
 
-# this needs fixing
-# system '[ -f Makefile.SH ] && sh Makefile.SH';
-# system '[ -f Makefile.PL ] && perl Makefile.PL';
-
 
 ##############################################################################
 
@@ -534,10 +302,10 @@ then the name of the header file will be used, with the first character
 capitalized.
 .PP
 If the extension might need extra libraries, they should be included
-here.  The extension Makefile.SH will take care of checking whether
+here.  The extension Makefile.PL will take care of checking whether
 the libraries actually exist and how they should be loaded.
 The extra libraries should be specified in the form -lm -lposix, etc,
-just as on the cc command line.  By default, the Makefile.SH will
+just as on the cc command line.  By default, the Makefile.PL will
 search through the library path determined by Configure.  That path
 can be augmented by including arguments of the form -L/another/library/path
 in the extra-libraries argument.
@@ -558,9 +326,6 @@ Specifies a name to be used for the extension.
 .TP
 .B \-A
 Turns on both -a and -c.
-.TP
-.B \-m
-Causes an old-style Makefile.SH to be created.
 .SH EXAMPLES
 .nf
 
@@ -585,7 +350,7 @@ Causes an old-style Makefile.SH to be created.
 	# Extension is ONC::RPC.
 	h2xs -An ONC::RPC
 
-	# Makefile.SH will look for library -lrpc in 
+	# Makefile.PL will look for library -lrpc in 
 	# additional directory /opt/net/lib
 	h2xs rpcsvc/rusers -L/opt/net/lib -lrpc
 
@@ -595,7 +360,7 @@ No environment variables are used.
 .SH AUTHOR
 Larry Wall
 .SH "SEE ALSO"
-perl(1)
+perl(1) ExtUtils::MakeMaker
 .SH DIAGNOSTICS
 The usual warnings if it can't read or write the files involved.
 .ex
diff --git a/hints/aix.sh b/hints/aix.sh
index 81d2a0c91f..b8c05e0d65 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -10,10 +10,10 @@ ccdlflags='-bE:perl.exp'
 
 # The first 3 options would not be needed if dynamic libs. could be linked
 # with the compiler instead of ld.
-# -bI:$(TOP)/perl.exp   Read the exported symbols from the perl binary
-# -bE:$(EXT).exp        Export these symbols.  This file contains only one
-#                       symbol: boot_$(EXP)  can it be auto-generated?
-lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(TOP)/perl.exp -bE:$(EXT).exp -e _nostart -lc'
+# -bI:$(PERL_INC)/perl.exp  Read the exported symbols from the perl binary
+# -bE:$(BASEEXT).exp        Export these symbols.  This file contains only one
+#                           symbol: boot_$(EXP)  can it be auto-generated?
+lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).exp -e _nostart -lc'
 
 ccflags='-D_ALL_SOURCE'
 # Make setsockopt work correctly.  See man page.
diff --git a/lib/AutoSplit.pm b/lib/AutoSplit.pm
index dabf43cbb8..9867cffab7 100644
--- a/lib/AutoSplit.pm
+++ b/lib/AutoSplit.pm
@@ -100,7 +100,7 @@ sub autosplit_file{
 	local($", @p)="/";
 	foreach(split(/\//,"$autodir/$modpname")){
 	    push(@p, $_);
-	    next if -d "@p";
+	    next if -d "@p/";
 	    mkdir("@p",0777) or die "AutoSplit unable to mkdir @p: $!";
 	}
     }
diff --git a/lib/Cwd.pm b/lib/Cwd.pm
index 719d1d2622..12c2e16368 100644
--- a/lib/Cwd.pm
+++ b/lib/Cwd.pm
@@ -21,6 +21,7 @@ sub getcwd
 	return '';
     }
     $cwd = '';
+    $dotdots = '';
     do
     {
 	$dotdots .= '/' if $dotdots;
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 563241f1da..7deb401e4f 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -1,267 +1,776 @@
 package ExtUtils::MakeMaker;
 
-# Authors: Andy Dougherty	<doughera@lafcol.lafayette.edu>
-#	   Andreas Koenig	<k@franz.ww.TU-Berlin.DE>
-#	   Tim Bunce		<Tim.Bunce@ig.co.uk>
-
-# Last Revision: 12 Oct 1994
-
-# This utility is designed to write a Makefile for an extension 
-# module from a Makefile.PL. It is based on the excellent Makefile.SH
-# model provided by Andy Dougherty and the perl5-porters. 
-
-# It splits the task of generating the Makefile into several
-# subroutines that can be individually overridden.
-# Each subroutine returns the text it wishes to have written to
-# the Makefile.
+$Version = 3.6;		# Last edited 19th Dec 1994 by Tim Bunce
 
 use Config;
+use Carp;
+use Cwd;
+
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(writeMakefile mkbootstrap $Verbose);
-@EXPORT_OK = qw(%att @recognized_att_keys);
+@EXPORT = qw(&WriteMakefile &mkbootstrap $Verbose &writeMakefile);
+@EXPORT_OK = qw($Version %att %skip %Recognized_Att_Keys @MM_Sections %MM_Sections);
 
-use strict qw(refs);
+$Is_VMS = $Config{'osname'} eq 'VMS';
+require ExtUtils::MM_VMS if $Is_VMS;
 
-# Setup dummy package:
-# MY exists for overriding methods to be defined within
-unshift(@MY::ISA, qw(MM));
+use strict qw(refs);
 
+$Version = $Version;# avoid typo warning
 $Verbose = 0;
-$Subdirs = 0;	# set to 1 to have this .PL run all below
 $^W=1;
 
 
-# For most extensions it will do to call
-#
-#   use ExtUtils::MakeMaker
-#   &writeMakefile("potential_libs" => "-L/usr/alpha -lfoo -lbar");
-#
-# from Makefile.PL in the extension directory
-# It is also handy to include some of the following attributes:
-#
-@recognized_att_keys=qw(
-    TOP INC DISTNAME VERSION DEFINE OBJECT LDTARGET ARMAYBE
-    BACKUP_LIBS  AUTOSPLITMAXLEN LINKTYPE
-    potential_libs otherldflags perl fullperl
-    distclean_tarflags
-    clean_files realclean_files
-);
+=head1 NAME
 
-#
-# TOP      is the directory above lib/ and ext/ (normally ../..)
-#          (MakeMaker will normally work this out for itself)
-# INC      is something like "-I/usr/local/Minerva/include"
-# DISTNAME is a name of your choice for distributing the package
-# VERSION  is your version number
-# DEFINE   is something like "-DHAVE_UNISTD_H"
-# OBJECT   defaults to '$(BASEEXT).o', but can be a long string containing 
-#          all object files, e.g. "tkpBind.o tkpButton.o tkpCanvas.o"
-# LDTARGET defaults to $(OBJECT) and is used in the ld command
-#          (some machines need additional switches for bigger projects)
-# ARMAYBE  defaults to ":", but can be used to run ar before ld
-# BACKUP_LIBS is an anonymous array of libraries to be searched for
-#          until we get at least some output from ext/util/extliblist
-#          'potential_libs' => "-lgdbm",
-#          'BACKUP_LIBS' => [ "-ldbm -lfoo", "-ldbm.nfs" ]
-# AUTOSPLITMAXLEN defaults to 8 and is used when autosplit is done
-#          (can be set higher on a case-by-case basis)
-# defaults to `dynamic', can be set to `static'
+ExtUtils::MakeMaker - create an extension Makefile
 
-#
-# `make distclean'  builds $(DISTNAME)-$(VERSION).tar.Z after a clean
+=head1 SYNOPSIS
 
-# Be aware, that you can also pass attributes into the %att hash table
-# by calling Makefile.PL with an argument of the form TOP=/some/where.
+use ExtUtils::MakeMaker;
+WriteMakefile( ATTRIBUTE => VALUE [, ...] );
 
-# If the Makefile generated by default does not fit your purpose,
-# you may specify private subroutines in the Makefile.PL as there are:
-#
-# MY->initialize        =>   sub MY::initialize{ ... }
-# MY->post_initialize   =>   sub MY::post_initialize{ ... }
-# MY->constants         =>   etc
-# MY->dynamic
-# etc. (see function writeMakefile, for the current breakpoints)
-#
-# Each subroutines returns the text it wishes to have written to
-# the Makefile. To override a section of the Makefile you can
-# either say: 	sub MY::co { "new literal text" }
-# or you can edit the default by saying something like:
-#	sub MY::co { $_=MM->co; s/old text/new text/; $_ }
-#
-# If you still need a different solution, try to develop another 
-# subroutine, that fits your needs and submit the diffs to 
-# perl5-porters or comp.lang.perl as appropriate.
+=head1 DESCRIPTION
+
+This utility is designed to write a Makefile for an extension module
+from a Makefile.PL. It is based on the Makefile.SH model provided by
+Andy Dougherty and the perl5-porters.
+
+It splits the task of generating the Makefile into several subroutines
+that can be individually overridden.  Each subroutine returns the text
+it wishes to have written to the Makefile.
+
+=head2 Default Makefile Behaviour
+
+This section (not yet written) will describe how a default Makefile will behave.
+
+=head2 Determination of Perl Library and Installation Locations
+
+MakeMaker needs to know, or to guess, where certain things are located.
+Especially INST_LIB, INST_ARCHLIB, PERL_LIB, PERL_ARCHLIB and PERL_SRC.
+
+Because installperl does not currently install header files (etc) into
+the library the Perl source code must be available when building
+extensions.  Currently MakeMaker will default PERL_LIB and PERL_ARCHLIB
+to PERL_SRC/lib.  Later, once installperl does install header files
+(etc) into the library, PERL_*LIB will only default to PERL_SRC/lib if
+the extension is in PERL_SRC/ext/* (e.g., a standard extension).
+Otherwise PERL_*LIB and PERL_SRC will default to the public library
+locations.
+
+INST_LIB and INST_ARCHLIB default to PERL_LIB and PERL_ARCHLIB.
+
+=head2 Useful Default Makefile Macros
+
+FULLEXT = Pathname for extension directory (eg DBD/Oracle).
+
+BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT.
+
+ROOTEXT = Directory part of FULLEXT with leading slash (eg /DBD)
+
+PERL_LIB
+
+PERL_ARCHLIB
+
+INST_LIB
+
+INST_ARCHLIB
+
+INST_LIBDIR = $(INST_LIB)$(ROOTEXT)          (and INST_ARCHLIBDIR)
+
+INST_AUTODIR = $(INST_LIB)/auto/$(FULLEXT)   (and INST_ARCHAUTODIR)
+
+=head2 Customizing The Generated Makefile
+
+If the Makefile generated does not fit your purpose you can change it
+using the mechanisms described below.
+
+=head2 Using Attributes (and Parameters)
+
+The following attributes can be specified as arguments to WriteMakefile()
+or as NAME=VALUE pairs on the command line:
+
+(not yet complete)
+
+=head2 Overriding MakeMaker Methods
+
+If you cannot achieve the desired Makefile behaviour by specifying
+attributes you may define private subroutines in the Makefile.PL.
+Each subroutines returns the text it wishes to have written to
+the Makefile. To override a section of the Makefile you can
+either say:
+
+	sub MY::c_o { "new literal text" }
+
+or you can edit the default by saying something like:
+
+	sub MY::c_o { $_=MM->c_o; s/old text/new text/; $_ }
 
-sub writeMakefile {
+If you still need a different solution, try to develop another 
+subroutine, that fits your needs and submit the diffs to 
+perl5-porters@isu.edu or comp.lang.perl as appropriate.
+
+
+=head1 AUTHORS
+
+Andy Dougherty <doughera@lafcol.lafayette.edu>, Andreas Koenig
+<k@franz.ww.TU-Berlin.DE>, Tim Bunce <Tim.Bunce@ig.co.uk>
+
+=head1 MODIFICATION HISTORY
+
+v1, August 1994; by Andreas Koenig.
+
+Initial version. Based on Andy Dougherty's Makefile.SH work.
+
+v2, September 1994; by Tim Bunce.
+
+Use inheritance to implement overriding.  Methods return text so
+derived methods can edit it before it's output.  mkbootstrap() now
+executes the *_BS file in the DynaLoader package and automatically adds
+dl_findfile() if required. More support for nested modules.
+
+v3.0, October/November 1994; by Tim Bunce.
+
+Major reorganisation. Fixed perl binary locating code. Replaced single
+$(TOP) with $(PERL_SRC), $(PERL_LIB) and $(INST_LIB).  Restructured
+code.  Consolidated and/or eliminated several attributes and added
+argument name checking. Added initial pod documentation. Made generated
+Makefile easier to read. Added generic mechanism for passing parameters
+to specific sections of the Makefile. Merged in Andreas's perl version
+of Andy's extliblist.
+
+v3.1 November 11th 1994 by Tim Bunce
+
+Fixed AIX dynamic loading problem for nested modules. Fixed perl
+extliblist to give paths not names for libs so that cross-check works.
+Converted the .xs to .c translation to a suffix rule. Added a .xs.o
+rule for dumb makes.  Added very useful PM, XS and DIR attributes. Used
+new attributes to make other sections smarter (especially clean and
+realclean). Make clean no longer deletes Makefile so that a later make
+realclean can still work. Fixed all known problems.  Write temporary
+Makefile as Makefile.new and rename once complete.
+
+v3.2 November 18th 1994 By Tim Bunce
+
+Fixed typos, added makefile section (split out of a flattened
+perldepend section). Added subdirectories to test section. Added -lm
+fix for NeXT in extliblist. Added clean of *~ files. Tidied up clean
+and realclean sections to produce fewer lines. Major revision to the
+const_loadlibs comments for EXTRALIBS, LDLOADLIBS and BSLOADLIBS.
+Added LINKTYPE=\$(LINKTYPE) to subdirectory make invocations.
+Write temporary Makefile as MakeMaker.tmp. Write temporary xsubpp
+output files as xstmp.c instead of tmp. Now installs multiple PM files.
+Improved parsing of NAME=VALUE args. $(BOOTSTRAP) is now a dependency
+of $(INST_DYNAMIC). Improved init of PERL_LIB, INST_LIB and PERL_SRC.
+Reinstated $(TOP) for transition period.  Removed CONFIG_SH attribute
+(no longer used). Put INST_PM back and include .pm and .pl files in
+current and lib directory.  Allow OBJECT to contain newlines. ROOTEXT
+now has leading slash. Added INST_LIBDIR (containing ROOTEXT) and
+renamed AUTOEXT to INST_AUTO.  Assorted other cosmetic changes.
+All known problems fixed.
+
+v3.3 November 27th 1994 By Andreas Koenig
+
+Bug fixes submitted by Michael Peppler and Wayne Scott. Changed the
+order how @libpath is constructed in C<new_extliblist()>. Improved
+pod-structure. Relative paths in C<-L> switches to LIBS are turned into
+absolute ones now.  Included VMS support thanks to submissions by
+Charles Bailey.  Added warnings for switches other than C<-L> or C<-l>
+in new_extliblist() and if a library is not found at all. Changed
+dependency distclean:clean to distclean:realclean. Added dependency
+all->config. ext.libs is now written without duplicates and empty
+lines.  As old_extliblist() and new_extliblist() do not produce the
+same anymore, the default becomes new_extliblist(), though the warning
+remains, whenever they differ. The use of cflags is accompanied by a
+replacement: there will be a warning when the two routines lead to
+different results, but still the output of cflags will be used.
+Cosmetic changes (Capitalize globals, uncapitalize others, insert a
+C<:> as default for $postop). Added some verbosity.
+
+v3.4 December 7th 1994 By Andreas Koenig and Tim Bunce
+
+Introduced ARCH_LIB and required other perl files to be patched.
+
+v3.5 December 15th 1994 By Tim Bunce
+
+Based primarily on v3.3. Replaced ARCH_LIB with INST_ARCHLIB, which
+defaults to INST_LIB, because the rest of perl assumes that ./lib
+includes architecture dependent files. Ideally an ./archlib should
+exist, that would be more consistent and simplify installperl.
+Added linkext and $(INST_PM) dependencies to all: target. The linkext
+target (and subroutine) exists solely to depend on $(LINKTYPE). Any
+Makefile.PLs using LINKTYPE => '...' where '...' is not 'static' or
+'dynamic' should be changed to use 'linkext' => { LINKTYPE => '...' }.
+
+Automatic determination of PERL_* and INST_* has been revised.  The
+INST_* macros have INST_ARCH* and INST_*DIR variants. The ARCH variants
+point to the architecture specific directory and the *DIR variants
+include the module specific subdirectory path.  So INST_AUTO is now
+INST_AUTODIR and an INST_ARCHAUTODIR has also been defined.
+
+An AUTOSPLITFILE tool macro has been defined which will AutoSplit any
+named file into any named auto directory. This replaces AUTOSPLITLIB.
+MKPATH now accepts multiple paths. The paths INST_LIBDIR,
+INST_ARCHLIBDIR, INST_AUTODIR and INST_ARCHAUTODIR are made by the
+config: target. A new ext.libs mechanism has been added. installpm has
+been split and now calls installpm_x per file.  A section attribute
+mechanism has been added and skip cross-checking has been moved into a
+skipcheck function. MakeMaker now uses Cwd and File::Basename modules.
+
+v3.6 December 15th 1994 By Tim Bunce
+
+Added C and H attributes and corresponding macros. These default to the
+list of *.c and *.h files in the directory. C also includes *.c file
+names corresponding to any *.xs files in the directory. ARMAYBE should
+now be specified as an attribute of the dynamic_lib section. The installpm
+section now accepts a SPLITLIB attribute. This defaults to '$(INST_LIB)'.
+Improved automatic setting of INST_ARCHLIB. Newlines in OBJECT now translate
+into <space><backslash><newline><tab> for better formatting. Improved
+descriptive comments for EXTRALIBS, LDLOADLIBS and BSLOADLIBS. Bootstrap
+files are now always installed - (after a small patch) the DynaLoader will
+only read a non-empty bootstrap file. Subdirectory dependencies have
+been improved. The .c files produced from .xs files now depend on
+XSUBPPDEPS (the typemaps).
+
+
+=head1 NOTES
+
+MakeMaker development work still to be done:
+
+Needs more complete documentation.
+
+Replace use of cflags with %Config (taking note of hints etc)
+
+Move xsubpp and typemap into lib/ExtUtils/...
+
+The ext.libs file mechanism will need to be revised to allow a
+make-a-perl [list-of-static-extensions] script to work.
+
+Eventually eliminate use of $(PERL_SRC). This must wait until
+MakeMaker is the standard and Larry makes the required changes
+elsewhere.
+
+Add method to take a list of files and wrap it in a Makefile
+compatible way (<space><backslash><newline><tab>).
+
+=cut
+
+
+# Setup dummy package:
+# MY exists for overriding methods to be defined within
+unshift(@MY::ISA, qw(MM));
+
+# Dummy package MM inherits actual methods from OS-specific
+# default packages.  We use this intermediate package so
+# MY->func() can call MM->func() and get the proper
+# default routine without having to know under what OS
+# it's running.
+unshift(@MM::ISA, $Is_VMS ? qw(ExtUtils::MM_VMS MM_Unix) : qw(MM_Unix));
+
+$Attrib_Help = <<'END';
+ NAME:		Perl module name for this extension (DBD::Oracle)
+		This defaults to the directory name.
+
+ DISTNAME:	Your name for distributing the package (by tar file)
+		This defaults to NAME above.
+
+ VERSION:	Your version number for distributing the package.
+		This defaults to 0.1.
+
+ INST_LIB:	Perl library directory to install the module into.
+ INST_ARCHLIB:	Perl architecture-dependent library to install into
+		(defaults to INST_LIB)
+
+ PERL_LIB:	Directory containing the Perl library to use.
+ PERL_SRC:	Directory containing the Perl source code
+		(use of this should be avoided, it may be removed later)
+
+ INC:		Include file dirs eg: '-I/usr/5include -I/path/to/inc'
+ DEFINE:	something like "-DHAVE_UNISTD_H"
+ OBJECT:	List of object files, defaults to '$(BASEEXT).o',
+		but can be a long string containing all object files,
+		    e.g. "tkpBind.o tkpButton.o tkpCanvas.o"
+ MYEXTLIB:	If the extension links to a library that it builds
+		set this to the name of the library (see SDBM_File)
+
+ LIBS:		An anonymous array of alternative library specifications
+		to be searched for (in order) until at least one library
+		is found.
+		  'LIBS' => [ "-lgdbm", "-ldbm -lfoo", "-L/path -ldbm.nfs" ]
+		Mind, that any element of the array contains a complete
+		set of arguments for the ld command. So do not specify
+		  'LIBS' => ["-ltcl", "-ltk", "-lX11" ], #wrong
+		See ODBM_File/Makefile.PL for an example, where an
+		array is needed. If you specify a scalar as in
+		  'LIBS' => "-ltcl -ltk -lX11"
+		MakeMaker will turn it into an array with one element.
+
+ LDTARGET:	defaults to "$(OBJECT)" and is used in the ld command
+		(some machines need additional switches for bigger projects)
+
+ DIR:		Ref to array of subdirectories containing Makefile.PLs
+		e.g. [ 'sdbm' ] in ext/SDBM_File
+
+ PM:		Hashref of .pm files and *.pl files to be installed.
+		e.g. { 'name_of_file.pm' => '$(INST_LIBDIR)/install_as.pm' }
+		By default this will include *.pm and *.pl. If a lib directory
+		exists and is not listed in DIR (above) then any *.pm and
+		*.pl files it contains will also be included by default.
+
+ XS:		Hashref of .xs files. MakeMaker will default this.
+		e.g. { 'name_of_file.xs' => 'name_of_file.c' }
+		The .c files will automatically be included in the list
+		of files deleted by a make clean.
+
+ C:		Ref to array of *.c file names. Initialised from a directory scan
+		and the values portion of the XS attribute hash. This is not
+		currently used by MakeMaker but may be handy in Makefile.PLs.
+
+ H:		Ref to array of *.h file names. Similar to C: above.
+
+ LINKTYPE:	=>'static' or 'dynamic' (default unless usedl=undef in config.sh)
+		Should only be used to force static linking (also see linkext below).
+
+ CONFIG:	=>[qw(archname manext)] defines ARCHNAME & MANEXT from config.sh
+ SKIP:  	=>[qw(name1 name2)] skip (do not write) sections of the Makefile
+
+ PERL:
+ FULLPERL:
+
+Additional lowercase attributes can be used to pass parameters to the
+methods which implement that part of the Makefile. These are not
+normally required:
+
+ installpm:	{SPLITLIB => '$(INST_LIB)' (default) or '$(INST_ARCHLIB)'}
+ linkext:	{LINKTYPE => 'static', 'dynamic' or ''}
+ dynamic_lib	{ARMAYBE => 'ar', OTHERLDFLAGS => '...'}
+ clean:		{FILES => "*.xyz foo"}
+ realclean:	{FILES => '$(INST_AUTODIR)/*.xyz'}
+ distclean:	{TARNAME=>'MyTarFile', TARFLAGS=>'cvfF', COMPRESS=>'gzip'}
+ tool_autosplit:	{MAXLEN => 8}
+END
+
+@MM_Sections_spec = (
+    'post_initialize'	=> {},
+    'constants'		=> {},
+    'const_config'	=> {},
+    'const_loadlibs'	=> {},
+    'const_cccmd'	=> {},
+    'tool_autosplit'	=> {},
+    'tool_xsubpp'	=> {},
+    'tools_other'	=> {},
+    'post_constants'	=> {},
+    'c_o'		=> {},
+    'xs_c'		=> {},
+    'xs_o'		=> {},
+    'top_targets'	=> {},
+    'linkext'		=> {},
+    'dynamic'		=> {},
+    'dynamic_bs'	=> {},
+    'dynamic_lib'	=> {},
+    'static'		=> {},
+    'static_lib'	=> {},
+    'installpm'		=> {},
+    'subdirs'		=> {},
+    'clean'		=> {},
+    'realclean'		=> {},
+    'distclean'		=> {},
+    'test'		=> {},
+    'install'		=> {},
+    'force'		=> {},
+    'perldepend'	=> {},
+    'makefile'		=> {},
+    'postamble'		=> {},
+);
+%MM_Sections = @MM_Sections_spec; # looses section ordering
+@MM_Sections = grep(!ref, @MM_Sections_spec); # keeps order
+
+%Recognized_Att_Keys = %MM_Sections; # All sections are valid keys.
+foreach(split(/\n/,$Attrib_Help)){
+    chomp;
+    next unless m/^\s*(\w+):\s*(.*)/;
+    $Recognized_Att_Keys{$1} = $2;
+    print "Attribute '$1' => '$2'\n" if ($Verbose >= 2);
+}
+
+%att  = ();
+%skip = ();
+
+sub skipcheck{
+    my($section) = @_;
+    return 'skipped' if $skip{$section};
+    return '';
+}
+
+
+sub WriteMakefile {
     %att = @_;
     local($\)="\n";
 
-    foreach (@ARGV){
-	$att{$1}=$2 if m/(.*)=(.*)/;
-    }
     print STDOUT "MakeMaker" if $Verbose;
-    print STDOUT map("	$_ = '$att{$_}'\n", sort keys %att) if ($Verbose && %att);
 
-    MY->initialize();
+    parse_args(\%att, @ARGV);
+    my(%initial_att) = %att; # record initial attributes
 
-    print STDOUT "Writing ext/$att{FULLEXT}/Makefile (with variable substitutions)";
+    MY->initialize(@ARGV);
 
-    open MAKE, ">Makefile" or die "Unable to open Makefile: $!";
+    print STDOUT "Writing Makefile for $att{NAME}";
 
-    MY->mkbootstrap(split(" ", $att{'dynaloadlibs'}));
-    print MAKE MY->post_initialize;
+    unlink("Makefile", "MakeMaker.tmp", $Is_VMS ? 'Descrip.MMS' : '');
+    open MAKE, ">MakeMaker.tmp" or die "Unable to open MakeMaker.tmp: $!";
+    select MAKE; $|=1; select STDOUT;
 
-    print MAKE MY->constants;
-    print MAKE MY->post_constants;
+    print MAKE "# This Makefile is for the $att{NAME} extension to perl.\n#";
+    print MAKE "# It was generated automatically by MakeMaker from the contents";
+    print MAKE "# of Makefile.PL. Don't edit this file, edit Makefile.PL instead.";
+    print MAKE "#\n#	ANY CHANGES MADE HERE WILL BE LOST! \n#";
+    print MAKE "#   MakeMaker Parameters: ";
+    foreach $key (sort keys %initial_att){
+	my($v) = neatvalue($initial_att{$key});
+	$v =~ tr/\n/ /s;
+	print MAKE "#	$key => $v";
+    }
 
-    print MAKE MY->subdir if $Subdirs;
-    print MAKE MY->dynamic;
-    print MAKE MY->force;
-    print MAKE MY->static;
-    print MAKE MY->co;
-    print MAKE MY->c;
-    print MAKE MY->installpm;
-    print MAKE MY->clean;
-    print MAKE MY->realclean;
-    print MAKE MY->test;
-    print MAKE MY->install;
-    print MAKE MY->perldepend;
-    print MAKE MY->distclean;
-    print MAKE MY->postamble;
+    # build hash for SKIP to make testing easy
+    %skip = map( ($_,1), @{$att{'SKIP'} || []});
+
+    foreach $section ( @MM_Sections ){
+	print "Processing Makefile '$section' section" if ($Verbose >= 2);
+	my($skipit) = skipcheck($section);
+	if ($skipit){
+	    print MAKE "\n# --- MakeMaker $section section $skipit.";
+	} else {
+	    my(%a) = %{$att{$section} || {}};
+	    print MAKE "\n# --- MakeMaker $section section:";
+	    print MAKE "# ",%a if ($Verbose >= 2);
+	    print(MAKE MY->nicetext(MY->$section( %a )));
+	}
+    }
 
-    MY->finish;
+    if ($Verbose){
+	print MAKE "\n# Full list of MakeMaker attribute values:";
+	foreach $key (sort keys %att){
+	    my($v) = neatvalue($att{$key});
+	    $v =~ tr/\n/ /s;
+	    print MAKE "#	$key => $v";
+	}
+    }
 
+    print MAKE "\n# End.";
     close MAKE;
+    my($finalname) = $Is_VMS ? "Descrip.MMS" : "Makefile";
+    rename("MakeMaker.tmp", $finalname);
+
+    chmod 0644, $finalname;
+    system("$Config{'eunicefix'} $finalname") unless $Config{'eunicefix'} eq ":";
 
     1;
 }
 
 
 sub mkbootstrap{
-    MY->mkbootstrap(@_)
+    parse_args(\%att, @ARGV);
+    MY->mkbootstrap(@_);
 }
 
 
-sub avoid_typo_warnings{
-    local($t) = "$t
-	$main::writeMakefile
-	$main::mkbootstrap
-	$main::Verbose
-	$DynaLoader::dl_resolve_using
-	$ExtUtils::MakeMaker::Config
-	$DynaLoader::Config
-    ";
+sub parse_args{
+    my($attr, @args) = @_;
+    foreach (@args){
+	next unless m/(.*?)=(.*)/;
+	$$attr{$1} = $2;
+    }
+    # catch old-style 'potential_libs' and inform user how to 'upgrade'
+    if (defined $$attr{'potential_libs'}){
+	my($msg)="'potential_libs' => '$$attr{potential_libs}' should be";
+	if ($$attr{'potential_libs'}){
+	    print STDERR "$msg changed to:\n\t'LIBS' => ['$$attr{potential_libs}']\n";
+	} else {
+	    print STDERR "$msg deleted.\n";
+	}
+	$$attr{LIBS} = [$$attr{'potential_libs'}];
+	delete $$attr{'potential_libs'};
+    }
+    # catch old-style 'ARMAYBE' and inform user how to 'upgrade'
+    if (defined $$attr{'ARMAYBE'}){
+	my($armaybe) = $$attr{'ARMAYBE'};
+	print STDERR "ARMAYBE => '$armaybe' should be changed to:\n",
+			"\t'dynamic_lib' => {ARMAYBE => '$armaybe'}\n";
+	my(%dl) = %{$$attr{'dynamic_lib'} || {}};
+	$$attr{'dynamic_lib'} = { %dl, ARMAYBE => $armaybe};
+	delete $$attr{'ARMAYBE'};
+    }
+    foreach(sort keys %{$attr}){
+	print STDOUT "	$_ => ".neatvalue($$attr{$_}) if ($Verbose);
+	warn "'$_' is not a known MakeMaker parameter name.\n"
+	    unless exists $Recognized_Att_Keys{$_};
+    }
 }
 
 
-# --- Supply the MakeMaker default methods ---
+sub neatvalue{
+    my($v) = @_;
+    my($t) = ref $v;
+    return "'$v'" unless $t;
+    return "[ ".join(', ',map("'$_'",@$v))." ]" if ($t eq 'ARRAY');
+    return "$v" unless $t eq 'HASH';
+    my(@m, $key, $val);
+    push(@m,"$key=>".neatvalue($val)) while (($key,$val) = each %$v);
+    return "{ ".join(', ',@m)." }";
+}
+
+
+# ------ Define the MakeMaker default methods in package MM_Unix ------
 
-package MM;
+package MM_Unix;
 
 use Config;
+use Cwd;
+use File::Basename;
 require Exporter;
 
-Exporter::import('ExtUtils::MakeMaker', qw(%att @recognized_att_keys));
+Exporter::import('ExtUtils::MakeMaker',
+	qw(%att %skip %Recognized_Att_Keys $Verbose));
 
-# These attributes cannot be overridden
-@other_att_keys=qw(extralibs dynaloadlibs statloadlibs bootdep);
+# These attributes cannot be overridden externally
+@Other_Att_Keys{qw(EXTRALIBS BSLOADLIBS LDLOADLIBS)} = (1) x 3;
 
-
-sub find_perl{
-    my($self, $ver, $names, $dirs, $trace) = @_;
-    my($name, $dir);
-    print "Looking for perl $ver by these names: @$names, in these dirs: @$dirs\n"
-	if ($trace);
-    foreach $dir (@$dirs){
-	foreach $name (@$names){
-	    print "checking $dir/$name\n" if ($trace >= 2);
-	    next unless -x "$dir/$name";
-	    print "executing $dir/$name\n" if ($trace);
-	    my($out) = `$dir/$name -e 'require $ver; print "5OK\n" ' 2>&1`;
-	    return "$dir/$name" if $out =~ /5OK/;
-	}
-    }
-    warn "Unable to find a perl $ver (by these names: @$names, in these dirs: @$dirs)\n";
-    0; # false and not empty
+if ($Is_VMS = $Config{'osname'} eq 'VMS') {
+    require File::VMSspec;
+    import File::VMSspec 'vmsify';
 }
 
 
 sub initialize {
-    # Find out directory name.  This is also the extension name.
-    chop($pwd=`pwd`);
+    # Find out directory name.  This may contain the extension name.
+    my($pwd) = fastcwd(); # from Cwd.pm
+
+    # --- Initialize PERL_LIB, INST_LIB, PERL_SRC
+
+    # *Real* information: where did we get these two from? ...
+    $inc_config_dir = dirname($INC{'Config.pm'});
+    $inc_carp_dir   = dirname($INC{'Carp.pm'});
+
+    # Typically PERL_* and INST_* will be identical but that need
+    # not be the case (e.g., installing into project libraries etc).
+
+    # Perl Macro:    With source    No source
+    # PERL_LIB       ../../lib      /usr/local/lib/perl5
+    # PERL_ARCHLIB   ../../lib      /usr/local/lib/perl5/sun4-sunos
+    # PERL_SRC       ../..          (undecided)
+
+    # INST Macro:    Locally        Publically
+    # INST_LIB       ../../lib      /usr/local/lib/perl5
+    # INST_ARCHLIB   ../../lib      /usr/local/lib/perl5/sun4-sunos
 
-    unless ( $top = $att{TOP} ){
+    # This code will need to be reworked to deal with having no perl
+    # source.  PERL_LIB should become the primary focus.
+
+    unless ($att{PERL_SRC}){
 	foreach(qw(../.. ../../.. ../../../..)){
-	    ($top=$_, last) if -f "$_/config.sh";
+	    ($att{PERL_SRC}=$_, last) if -f "$_/config.sh";
 	}
-	die "Can't find config.sh" unless -f "$top/config.sh";
     }
-    chdir $top or die "Couldn't chdir $top: $!";
-    chop($abstop=`pwd`);
-    chdir $pwd;
+    unless ($att{PERL_SRC}){
+	# Later versions will not die here.
+	die "Unable to locate perl source. Try setting PERL_SRC.\n";
+	# we should also consider $ENV{PERL5LIB} here
+	$att{PERL_LIB}     = $Config{'privlib'} unless $att{PERL_LIB};
+	$att{PERL_ARCHLIB} = $Config{'archlib'} unless $att{PERL_ARCHLIB};
+    } else {
+	$att{PERL_LIB}     = "$att{PERL_SRC}/lib" unless $att{PERL_LIB};
+	$att{PERL_ARCHLIB} = $att{PERL_LIB};
+    }
+
+    # INST_LIB typically pre-set if building an extension after
+    # perl has been built and installed. Setting INST_LIB allows
+    # You to build directly into privlib and avoid installperl.
+    $att{INST_LIB} = $att{PERL_LIB} unless $att{INST_LIB};
+
+    # Try to work out what INST_ARCHLIB should be if not set:
+    unless ($att{INST_ARCHLIB}){
+	my(%archmap) = (
+	    $att{PERL_LIB}	=> $att{PERL_ARCHLIB},
+	    $Config{'privlib'}	=> $Config{'archlib'},
+	    $Config{'installprivlib'}	=> $Config{'installarchlib'},
+	    $inc_carp_dir	=> $inc_config_dir,
+	);
+	$att{INST_ARCHLIB} = $archmap{$att{INST_LIB}};
+	die "Unable to determine INST_ARCHLIB. Please define it explicitly.\n"
+	    unless $att{INST_ARCHLIB};
+    }
+
+    # make a few simple checks
+    die "PERL_LIB ($att{PERL_LIB}) is not a perl library directory"
+	unless (-f "$att{PERL_LIB}/Exporter.pm");
+
+    # --- Initialize Module Name and Paths
 
-    # EXTMODNAME = The perl module name for this extension.
-    # FULLEXT = Full pathname to extension directory.
+    # NAME    = The perl module name for this extension (eg DBD::Oracle).
+    # FULLEXT = Pathname for extension directory (eg DBD/Oracle).
     # BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT.
-    # ROOTEXT = Directory part of FULLEXT. May be empty.
-    my($p) = $pwd; $p =~ s:^\Q$abstop/ext/\E::;
-    ($att{EXTMODNAME}=$p) =~ s#/#::#g ;		#eg. BSD::Foo::Socket
-    ($att{FULLEXT}   =$p);			#eg. BSD/Foo/Socket
-    ($att{BASEEXT}   =$p) =~ s:.*/:: ;		#eg. Socket
-    ($att{ROOTEXT}   =$p) =~ s:/?\Q$att{BASEEXT}\E$:: ; #eg. BSD/Foo
-
-    # Find Perl 5. The only contract here is that both 'perl' and 'fullperl'
+    # ROOTEXT = Directory part of FULLEXT with leading /.
+    unless($att{NAME}){ # we have to guess our name
+	my($name) = $pwd;
+	if ($Is_VMS) {
+	  $name =~ s:.*?([^.\]]+)\]:$1: unless ($name =~ s:.*[.\[]ext\.::);
+	  ($att{NAME}=$name) =~ s#[.\]]#::#g;
+	} else {
+	  $name =~ s:.*/:: unless ($name =~ s:^.*/ext/::);
+	  ($att{NAME} =$name) =~ s#/#::#g;
+	}
+    }
+    ($att{FULLEXT} =$att{NAME}) =~ s#::#/#g ;		#eg. BSD/Foo/Socket
+    ($att{BASEEXT} =$att{NAME}) =~ s#.*::##;		#eg. Socket
+    ($att{ROOTEXT} =$att{FULLEXT}) =~ s#/?\Q$att{BASEEXT}\E$## ; # eg. /BSD/Foo
+    $att{ROOTEXT} = "/$att{ROOTEXT}" if $att{ROOTEXT};
+    $att{ROOTEXT} = "" if $Is_VMS;
+
+    ($att{DISTNAME}=$att{NAME}) =~ s#(::)#-#g;
+    $att{VERSION} = "0.1" unless $att{VERSION};
+
+
+    # --- Initialize Perl Binary Locations
+
+    # Find Perl 5. The only contract here is that both 'PERL' and 'FULLPERL'
     # will be working versions of perl 5.
-    $att{'perl'} = MY->find_perl(5.0, [ qw(perl5 perl miniperl) ],
-			    [ $abstop, split(":", $ENV{PATH}) ], 0 )
-	    unless ($att{'perl'} && -x $att{'perl'});
+    $att{'PERL'} = MY->find_perl(5.0, [ qw(perl5 perl miniperl) ],
+	    [ $att{PERL_SRC}, split(":", $ENV{PATH}), $Config{'bin'} ], 0 )
+	unless ($att{'PERL'} && -x $att{'PERL'});
 
-    # Define 'fullperl' to be a non-miniperl (used in test: target)
-    ($att{'fullperl'} = $att{'perl'}) =~ s/miniperl$/perl/
-	unless ($att{'fullperl'} && -x $att{'fullperl'});
+    # Define 'FULLPERL' to be a non-miniperl (used in test: target)
+    ($att{'FULLPERL'} = $att{'PERL'}) =~ s/miniperl/perl/
+	unless ($att{'FULLPERL'} && -x $att{'FULLPERL'});
 
-    for $key (@recognized_att_keys, @other_att_keys){
+    if ($Is_VMS) {
+	($att{'PERL'} = 'MCR ' . vmsify($att{'PERL'})) =~ s:.*/::;
+	($att{'FULLPERL'} = 'MCR ' . vmsify($att{'FULLPERL'})) =~ s:.*/::;
+    }
+
+    # --- Initialize File and Directory Lists (.xs .pm etc)
+
+    {
+	my($name, %dir, %xs, %pm, %c, %h, %ignore);
+	$ignore{'test.pl'} = 1;
+	$ignore{'makefile.pl'} = 1 if $Is_VMS;
+	foreach $name (lsdir(".")){
+	    next if ($name =~ /^\./ or $ignore{$name});
+	    if (-d $name){
+		$dir{$name} = $name if (-f "$name/Makefile.PL");
+	    }elsif ($name =~ /\.xs$/){
+		my($c); ($c = $name) =~ s/\.xs$/.c/;
+		$xs{$name} = $c;
+		$c{$c} = 1;
+	    }elsif ($name =~ /\.c$/){
+		$c{$name} = 1;
+	    }elsif ($name =~ /\.h$/){
+		$h{$name} = 1;
+	    }elsif ($name =~ /\.p[ml]$/){
+		$pm{$name} = "\$(INST_LIBDIR)/$name";
+	    }
+	}
+
+	# If we have a ./lib dir that does NOT contain a Makefile.PL
+	# then add in any .pm and .pl files in that directory.
+	# This makes it easy and tidy to ship a number of perl files.
+	if (-d "lib" and !$dir{'lib'}){
+	    foreach $name (lsdir("lib")){
+		next unless ($name =~ /\.p[ml]$/);
+		$pm{"lib/$name"} = "\$(INST_LIBDIR)/$name";
+	    }
+	}
+
+	$att{DIR} = [sort keys %dir] unless $att{DIRS};
+	$att{XS}  = \%xs             unless $att{XS};
+	$att{PM}  = \%pm             unless $att{PM};
+	$att{C}   = [sort keys %c]   unless $att{C};
+	$att{H}   = [sort keys %h]   unless $att{H};
+    }
+
+    # --- Initialize Other Attributes
+
+    for $key (keys(%Recognized_Att_Keys), keys(%Other_Att_Keys)){
 	# avoid warnings for uninitialized vars
-	$att{$key} = "" unless defined $att{$key};
+	next if exists $att{$key};
+	$att{$key} = "";
     }
 
-    # compute extralibs, dynaloadlibs and statloadlibs from
-    # $att{'potential_libs'}
+    # Compute EXTRALIBS, BSLOADLIBS and LDLOADLIBS from $att{'LIBS'}
+    # Lets look at $att{LIBS} carefully: It may be an anon array, a string or
+    # undefined. In any case we turn it into an anon array:
+    $att{LIBS}=[] unless $att{LIBS};
+    $att{LIBS}=[$att{LIBS}] if ref \$att{LIBS} eq SCALAR;
+    foreach ( @{$att{'LIBS'}} ){
+	s/^\s*(.*\S)\s*$/$1/; # remove leading and trailing whitespace
+	my(@libs) = MY->extliblist($_);
+	if ($libs[0] or $libs[1] or $libs[2]){
+	    @att{EXTRALIBS, BSLOADLIBS, LDLOADLIBS} = @libs;
+	    last;
+	}
+    }
 
-    unless ( &run_extliblist($att{'potential_libs'}) ){
-       foreach ( @{$att{'BACKUP_LIBS'} || []} ){
-           #  Try again.  Maybe they have specified some other libraries
-           last if  &run_extliblist($_);
-       }
+    warn "CONFIG must be an array ref\n"
+	if ($att{CONFIG} and ref $att{CONFIG} ne 'ARRAY');
+    $att{CONFIG} = [] unless (ref $att{CONFIG});
+    push(@{$att{CONFIG}},
+	qw( cc libc ldflags lddlflags ccdlflags cccdlflags
+	    ranlib so dlext dlsrc installprivlib installarchlib
+	));
+    push(@{$att{CONFIG}}, 'shellflags') if $Config{'shellflags'};
+
+    if ($Is_VMS) {
+      # This will not make other Makefile.PLs portable. Any Makefile.PL
+      # which says OBJECT => "foo.o bar.o" will fail on VMS. It might
+      # be better to fix the c_o section to produce .o files.
+      $att{OBJECT} = '$(BASEEXT).obj' unless $att{OBJECT};
+      $att{OBJECT} =~ s/[^,\s]\s+/, /g;
+      $att{OBJECT} =~ s/\n+/, /g;
+    } else {
+      $att{OBJECT} = '$(BASEEXT).o' unless $att{OBJECT};
+      $att{OBJECT} =~ s/\n+/ \\\n\t/g;
     }
+    $att{BOOTDEP}  = (-f "$att{BASEEXT}_BS") ? "$att{BASEEXT}_BS" : "";
+    $att{LDTARGET} = '$(OBJECT)'    unless $att{LDTARGET};
+    $att{LINKTYPE} = ($Config{'usedl'}) ? 'dynamic' : 'static'
+	unless $att{LINKTYPE};
+
 }
 
 
-sub run_extliblist {
-    my($potential_libs)=@_;
-    # Now run ext/util/extliblist to discover what *libs definitions
-    # are required for the needs of $potential_libs
-    $ENV{'potential_libs'} = $potential_libs;
-    $_=`. $abstop/ext/util/extliblist;
-	echo extralibs=\$extralibs
-	echo dynaloadlibs=\$dynaloadlibs
-	echo statloadlibs=\$statloadlibs
-	echo bootdep=\$bootdep
-	`;
-    my(@w);
-    foreach $line (split "\n", $_){
-	chomp $line;
-	if ($line =~ /(.*)\s*=\s*(.*)$/){
-	    $att{$1} = $2;
-	    print STDERR "	$1 = $2" if $Verbose;
-	}else{
-	    push(@w, $line);
+sub lsdir{
+    local(*DIR, @ls);
+    opendir(DIR, $_[0] || ".") or die "opendir: $!";
+    @ls = readdir(DIR);
+    closedir(DIR);
+    @ls;
+}
+
+
+sub find_perl{
+    my($self, $ver, $names, $dirs, $trace) = @_;
+    my($name, $dir);
+    print "Looking for perl $ver by these names: @$names, in these dirs: @$dirs\n"
+	if ($trace);
+    foreach $dir (@$dirs){
+	foreach $name (@$names){
+	    print "checking $dir/$name\n" if ($trace >= 2);
+	    if ($Is_VMS) {
+	      $name .= ".exe" unless -x "$dir/$name";
+	    }
+	    next unless -x "$dir/$name";
+	    print "executing $dir/$name\n" if ($trace);
+	    my($out);
+	    if ($Is_VMS) {
+	      my($vmscmd) = 'MCR ' . vmsify("$dir/$name");
+	      $out = `$vmscmd -e "require $ver; print ""VER_OK\n"""`;
+	    } else {
+	      $out = `$dir/$name -e 'require $ver; print "VER_OK\n" ' 2>&1`;
+	    }
+	    return "$dir/$name" if $out =~ /VER_OK/;
 	}
     }
-    print STDERR "Messages from extliblist:\n", join("\n",@w,'')
-       if @w ;
-    join '', @att{qw(extralibs dynaloadlibs statloadlibs)};
+    warn "Unable to find a perl $ver (by these names: @$names, in these dirs: @$dirs)\n";
+    0; # false and not empty
 }
 
 
@@ -273,133 +782,220 @@ sub post_initialize{
 sub constants {
     my(@m);
 
-    $att{BOOTDEP}  = (-f "$att{BASEEXT}_BS") ? "$att{BASEEXT}_BS" : "";
-    $att{OBJECT}   = '$(BASEEXT).o' unless $att{OBJECT};
-    $att{LDTARGET} = '$(OBJECT)'    unless $att{LDTARGET};
-    $att{ARMAYBE}  = ":"            unless $att{ARMAYBE};
-    $att{AUTOSPLITMAXLEN} = 8       unless $att{AUTOSPLITMAXLEN};
-    $att{LINKTYPE} = ($Config{'usedl'}) ? 'dynamic' : 'static'
-	unless $att{LINKTYPE};
-
-
     push @m, "
-#
-# This Makefile is for the $att{FULLEXT} extension to perl.
-# It was written by Makefile.PL, so don't edit it, edit
-# Makefile.PL instead. ANY CHANGES MADE HERE WILL BE LOST!
-# 
-
+NAME = $att{NAME}
 DISTNAME = $att{DISTNAME}
 VERSION = $att{VERSION}
 
-TOP = $top
-ABSTOP = $abstop
-PERL = $att{'perl'}
-FULLPERL = $att{'fullperl'}
+# In which library should we install this extension?
+# This is typically the same as PERL_LIB.
+# (also see INST_LIBDIR and relationship to ROOTEXT)
+INST_LIB = $att{INST_LIB}
+INST_ARCHLIB = $att{INST_ARCHLIB}
+
+# Perl library to use when building the extension
+PERL_LIB = $att{PERL_LIB}
+PERL_ARCHLIB = $att{PERL_ARCHLIB}
+
+# Where is the perl source code located? (Eventually we should
+# be able to build extensions without requiring the perl source
+# but that's a way off yet).
+PERL_SRC = $att{PERL_SRC}
+# Perl header files (will eventually be under PERL_LIB)
+PERL_INC = $att{PERL_SRC}
+# Perl binaries
+PERL = $att{'PERL'}
+FULLPERL = $att{'FULLPERL'}
+
+# FULLEXT = Pathname for extension directory (eg DBD/Oracle).
+# BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT.
+# ROOTEXT = Directory part of FULLEXT with leading slash (eg /DBD)
+FULLEXT = $att{FULLEXT}
+BASEEXT = $att{BASEEXT}
+ROOTEXT = $att{ROOTEXT}
+
+# These will be removed later. Use PERL_SRC and BASEEXT instead.
+TOP = \$(PERL_SRC)
+EXT = CHANGE_EXT_TO_BASEEXT
+
 INC = $att{INC}
 DEFINE = $att{DEFINE}
 OBJECT = $att{OBJECT}
 LDTARGET = $att{LDTARGET}
-";
-
-    push @m, "
-CC = $Config{'cc'}
-LIBC = $Config{'libc'}
-LDFLAGS = $Config{'ldflags'}
-CLDFLAGS = $Config{'ldflags'}
 LINKTYPE = $att{LINKTYPE}
-ARMAYBE = $att{ARMAYBE}
-RANLIB = $Config{'ranlib'}
-
-SMALL = $Config{'small'}
-LARGE = $Config{'large'} $Config{'split'}
-# The following are used to build and install shared libraries for
-# dynamic loading.
-LDDLFLAGS = $Config{'lddlflags'}
-CCDLFLAGS = $Config{'ccdlflags'}
-CCCDLFLAGS = $Config{'cccdlflags'}
-SO = $Config{'so'}
-DLEXT = $Config{'dlext'}
-DLSRC = $Config{'dlsrc'}
-";
 
-    push @m, "
-# $att{FULLEXT} might need to be linked with some extra libraries.
-# EXTRALIBS =  full list of libraries needed for static linking.
-#		Only those libraries that actually exist are included.
-# DYNALOADLIBS = list of those libraries that are needed but can be
-#		linked in dynamically on this platform.  On SunOS, for
-#		example, this would be .so* libraries, but not archive
-#		libraries.  The bootstrap file is installed only if
-#		this list is not empty.
-# STATLOADLIBS = list of those libraries which must be statically
-#		linked into the shared library.  On SunOS 4.1.3, 
-#		for example,  I have only an archive version of
-#		-lm, and it must be linked in statically.
-EXTRALIBS = $att{'extralibs'}
-DYNALOADLIBS = $att{'dynaloadlibs'}
-STATLOADLIBS = $att{'statloadlibs'}
+# Source code:
+XS= ".join(" \\\n\t", sort keys %{$att{XS}})."
+C = ".join(" \\\n\t", @{$att{C}})."
+H = ".join(" \\\n\t", @{$att{H}})."
 
-";
+.SUFFIXES: .xs
 
-    push @m, "
-# EXTMODNAME = The perl module name for this extension.
-# FULLEXT = Full pathname to extension directory.
-# BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT.
-# ROOTEXT = Directory part of FULLEXT. May be empty.
-EXTMODNAME = $att{EXTMODNAME}
-FULLEXT = $att{FULLEXT}
-BASEEXT = $att{BASEEXT}
-ROOTEXT = $att{ROOTEXT}
-# and for backward compatibility and for AIX support (due to change!)
-EXT = $att{BASEEXT}
-
-# $att{FULLEXT} might have its own typemap
-EXTTYPEMAP = ".(-f "typemap" ? "typemap" : "")."
-# $att{FULLEXT} might have its own bootstrap support
-BOOTSTRAP = $att{BASEEXT}.bs
-BOOTDEP = $att{BOOTDEP}
+.PRECIOUS: Makefile
+
+.PHONY: all config static dynamic test 
+
+# This extension may link to it's own library (see SDBM_File)
+MYEXTLIB = $att{MYEXTLIB}
+
+# Where is the Config.pm that we are using/depend on
+CONFIGDEP = \$(PERL_ARCHLIB)/Config.pm
 ";
 
     push @m, '
 # Where to put things:
-AUTO = $(TOP)/lib/auto
-AUTOEXT = $(TOP)/lib/auto/$(FULLEXT)
-INST_BOOT = $(AUTOEXT)/$(BASEEXT).bs
-INST_DYNAMIC = $(AUTOEXT)/$(BASEEXT).$(DLEXT)
-INST_STATIC = $(BASEEXT).a
-INST_PM = $(TOP)/lib/$(FULLEXT).pm
-'."
-# These two are only used by install: targets
-INSTALLPRIVLIB = $Config{'installprivlib'}
-INSTALLARCHLIB = $Config{'installarchlib'}
+INST_LIBDIR     = $(INST_LIB)$(ROOTEXT)
+INST_ARCHLIBDIR = $(INST_ARCHLIB)$(ROOTEXT)
+
+INST_AUTODIR     = $(INST_LIB)/auto/$(FULLEXT)
+INST_ARCHAUTODIR = $(INST_ARCHLIB)/auto/$(FULLEXT)
+
+INST_BOOT    = $(INST_ARCHAUTODIR)/$(BASEEXT).bs
+INST_DYNAMIC = $(INST_ARCHAUTODIR)/$(BASEEXT).$(DLEXT)
+INST_STATIC  = $(BASEEXT).a
+INST_PM = '.join(" \\\n\t", sort values %{$att{PM}}).'
+';
+
+    join('',@m);
+}
+
+
+sub const_cccmd{
+    # This is implemented in the
+    # same manner as extliblist, e.g., do both and compare results during
+    # the transition period.
+  my($cc,$ccflags,$optimize,$large,$split)=@Config{qw(cc ccflags optimize large split)};
+  my($prog);
+  chop(my($old) = `cd $att{PERL_SRC}; sh $Config{'shellflags'} ./cflags $att{BASEEXT}.c`);
+  # Why is this written this way ?
+  if ($prog = $Config{"$att{BASEEXT}_cflags"}) {
+    my(@o)=`cc=\"$cc\"
+      ccflags=\"$ccflags\"
+      optimize=\"$optimize\"
+      large=\"$large\"
+      split=\"$split\"
+      eval '$prog'
+      echo cc=\$cc
+      echo ccflags=\$ccflags
+      echo optimize=\$optimize
+      echo large=\$large
+      echo split=\$split
+      `;
+    my(%cflags);
+    foreach $line (@o){
+      chomp $line;
+      if ($line =~ /(.*?)\s*=\s*(.*)\s*$/){
+	$cflags{$1} = $2;
+	print STDERR "	$1 = $2" if $Verbose;
+      }
+    }
+    ($cc,$ccflags,$optimize,$large,$split)=@cflags{qw(cc ccflags optimize large split)};
+  }
+
+  my($new) = "$cc -c $ccflags $optimize  $large $split";
+  if ($new ne $old) {
+    warn "Warning (non-fatal): cflags evaluation in MakeMaker differs from shell output\n"
+      ."   package: $att{NAME}\n"
+      ."   old: $old\n"
+      ."   new: $new\n"
+      ."   Using 'old' set.\n"
+      ."Please notify perl5-porters\@isu.edu\n";
+  }
+  my($cccmd)=$old;
+  "CCCMD = $cccmd\n";
+}
+
+
+# --- Constants Sections ---
+
+sub const_config{
+    my(@m,$m);
+    push(@m,"\n# These definitions are from config.sh (via $INC{'Config.pm'})\n");
+    my(%once_only);
+    foreach $m (@{$att{'CONFIG'}}){
+	next if $once_only{$m};
+	warn "CONFIG key '$m' does not exist in Config.pm\n"
+		unless exists $Config{$m};
+	push @m, "\U$m\E = $Config{$m}\n";
+	$once_only{$m} = 1;
+    }
+    join('', @m);
+}
+
+
+sub const_loadlibs{
+    "
+# $att{NAME} might depend on some other libraries:
+# (These comments may need revising:)
+#
+# Dependent libraries can be linked in one of three ways:
+#
+#  1.  (For static extensions) by the ld command when the perl binary
+#      is linked with the extension library. See EXTRALIBS below.
+#
+#  2.  (For dynamic extensions) by the ld command when the shared
+#      object is built/linked. See LDLOADLIBS below.
+#
+#  3.  (For dynamic extensions) by the DynaLoader when the shared
+#      object is loaded. See BSLOADLIBS below.
+#
+# EXTRALIBS =	List of libraries that need to be linked with when
+#		linking a perl binary which includes this extension
+#		Only those libraries that actually exist are included.
+#		These are written to a file and used when linking perl.
+#
+# LDLOADLIBS =	List of those libraries which can or must be linked into
+#		the shared library when created using ld. These may be
+#		static or dynamic libraries.
+#
+# BSLOADLIBS =	List of those libraries that are needed but can be
+#		linked in dynamically at run time on this platform.
+#		SunOS/Solaris does not need this because ld records
+#		the information (from LDLOADLIBS) into the object file.
+#		This list is used to create a .bs (bootstrap) file.
+#		The bootstrap file is installed only if it's not empty.
+#
+EXTRALIBS  = $att{'EXTRALIBS'}
+LDLOADLIBS = $att{'LDLOADLIBS'}
+BSLOADLIBS = $att{'BSLOADLIBS'}
 ";
+}
 
-    push @m, "\nshellflags = $Config{'shellflags'}" if $Config{'shellflags'};
 
-    push @m, q{
-# Tools
-SHELL = /bin/sh
-CCCMD = `sh $(shellflags) $(ABSTOP)/cflags $@`
-XSUBPP = $(TOP)/ext/xsubpp
-# the following is a portable way to say mkdir -p
-MKPATH = $(PERL) -we '$$"="/"; foreach(split(/\//,$$ARGV[0])){ push(@p, $$_); next if -d "@p"; print "mkdir @p\n"; mkdir("@p",0777)||die "mkdir @p: $$!" } exit 0;'
-AUTOSPLITLIB = cd $(TOP); \
-	$(PERL) -Ilib -e 'use AutoSplit; $$AutoSplit::Maxlen=}.$att{AUTOSPLITMAXLEN}.q{; autosplit_lib_modules(@ARGV) ;'
-};
+# --- Tool Sections ---
 
-    push @m, '
+sub tool_autosplit{
+    my($self, %attribs) = @_;
+    my($asl) = "";
+    $asl = "\$AutoSplit::Maxlen=$attribs{MAXLEN};" if $attribs{MAXLEN};
+    q{
+AUTOSPLITLIB = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -e 'use AutoSplit; chdir("$(INST_LIB)/..") or die $$!; $$AutoSplit::Maxlen=}.$asl.q{; autosplit_lib_modules(@ARGV) ;'
 
-all :: 
+# Usage: $(AUTOSPLITFILE) FileToSplit AutoDirToSplitInto
+AUTOSPLITFILE = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -e 'use AutoSplit;}.$asl.q{ AutoSplit::autosplit_file($$ARGV[0], $$ARGV[1], 0, 1, 1) ;'
+};
+}
 
-config :: Makefile
-	@$(MKPATH) $(AUTOEXT)
 
-install ::
+sub tool_xsubpp{
+    my(@tmdeps) = ('$(PERL_SRC)/ext/typemap');
+    push(@tmdeps, "typemap") if -f "typemap";
+    my(@tmargs) = map("-typemap $_", @tmdeps);
+    "
+XSUBPP = \$(PERL_SRC)/ext/xsubpp
+XSUBPPDEPS = @tmdeps
+XSUBPPARGS = @tmargs
+";
+};
 
-';
 
-    join('',@m);
+sub tools_other{
+    q{
+SHELL = /bin/sh
+
+# The following is a portable way to say mkdir -p
+MKPATH = $(PERL) -wle '$$"="/"; foreach $$p (@ARGV){ my(@p); foreach(split(/\//,$$p)){ push(@p,$$_); next if -d "@p/"; print "mkdir @p"; mkdir("@p",0777)||die $$! }} exit 0;'
+};
 }
 
 
@@ -408,182 +1004,363 @@ sub post_constants{
 }
 
 
-sub subdir {
-    my(@m);
-    foreach $MakefilePL (<*/Makefile.PL>){
-	($subdir=$MakefilePL) =~ s:/Makefile\.PL$:: ;
-	push @m, "
-config ::
-	\@cd $subdir ; \\
-	if test ! -f Makefile; then \\
-	test -f Makefile.PL  && \$(PERL) -I\$(ABSTOP)/lib Makefile.PL TOP=\$(ABSTOP) ; \\
-	fi
-
-all ::
-	cd $subdir ; \$(MAKE) config
-	cd $subdir ; \$(MAKE) all
-";
+# --- Translation Sections ---
 
-    }
-    join('',@m);
+sub c_o {
+    '
+.c.o:
+	$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) $(INC) $*.c
+';
 }
 
+sub xs_c {
+    '
+.xs.c:
+	$(PERL) $(XSUBPP) $(XSUBPPARGS) $*.xs >xstmp.c && mv xstmp.c $@
+';
+}
 
-sub co {
+sub xs_o {	# many makes are too dumb to use xs_c then c_o
     '
-.c.o:
-	$(CCCMD) $(CCCDLFLAGS) $(DEFINE) -I$(TOP) $(INC) $*.c
+.xs.o:
+	$(PERL) $(XSUBPP) $(XSUBPPARGS) $*.xs >xstmp.c && mv xstmp.c $*.c
+	$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) $(INC) $*.c
 ';
 }
 
 
-sub force {
+# --- Target Sections ---
+
+sub top_targets{
     '
-# Phony target to force checking subdirectories.
-FORCE:
+all ::	config linkext $(INST_PM)
+
+config :: Makefile
+	@$(MKPATH) $(INST_LIBDIR)  $(INST_ARCHLIBDIR)
+	@$(MKPATH) $(INST_AUTODIR) $(INST_ARCHAUTODIR)
+
+install :: all
 ';
 }
 
+sub linkext {
+    my($self, %attribs) = @_;
+    # LINKTYPE => static or dynamic
+    my($linktype) = $attribs{LINKTYPE} || '$(LINKTYPE)';
+    "
+linkext :: $linktype
+";
+}
+
+
+# --- Dynamic Loading Sections ---
 
 sub dynamic {
     '
-all::	$(LINKTYPE)
-
-# Target for Dynamic Loading:
-dynamic::	$(INST_DYNAMIC) $(INST_PM) $(INST_BOOT)
+# $(INST_PM) has been moved to the all: target.
+# It remains here for awhile to allow for old usage: "make dynamic"
+dynamic :: $(INST_DYNAMIC) $(INST_BOOT) $(INST_PM)
+';
+}
 
-$(INST_DYNAMIC): $(OBJECT)
-	@$(MKPATH) $(AUTOEXT)
-	$(ARMAYBE) cr $(EXTMODNAME).a $(OBJECT) 
-	ld $(LDDLFLAGS) -o $@ $(LDTARGET) '.$att{'otherldflags'}.' $(STATLOADLIBS)
+sub dynamic_bs {
+    my($self, %attribs) = @_;
+    '
+BOOTSTRAP = '."$att{BASEEXT}.bs".'
 
-$(BOOTSTRAP): $(BOOTDEP)
-	$(PERL) -I$(TOP)/lib -e \'use ExtUtils::MakeMaker; &mkbootstrap("$(DYNALOADLIBS)");\'
-	touch $(BOOTSTRAP)
+# As MakeMaker mkbootstrap might not write a file (if none is required)
+# we use touch to prevent make continually trying to remake it.
+# The DynaLoader only reads a non-empty file.
+$(BOOTSTRAP): '.$att{BOOTDEP}.' $(CONFIGDEP)
+	$(PERL) -I$(PERL_LIB) -e \'use ExtUtils::MakeMaker; &mkbootstrap("$(BSLOADLIBS)");\' INST_LIB=$(INST_LIB) PERL_SRC=$(PERL_SRC) NAME=$(NAME)
+	@touch $(BOOTSTRAP)
 
 $(INST_BOOT): $(BOOTSTRAP)
-	@test ! -s $(BOOTSTRAP) || cp $(BOOTSTRAP) $@
+	@rm -f $(INST_BOOT)
+	cp $(BOOTSTRAP) $(INST_BOOT)
 ';
 }
 
-
-sub static {
+sub dynamic_lib {
+    my($self, %attribs) = @_;
+    my($otherldflags) = $attribs{OTHERLDFLAGS} || "";
+    my($armaybe) = $attribs{ARMAYBE} || $att{ARMAYBE} || ":";
     '
-# Target for Static Loading:
-static:: $(INST_STATIC) $(INST_PM)
+ARMAYBE = '.$armaybe.'
+OTHERLDFLAGS = '.$otherldflags.'
 
-$(INST_STATIC): $(OBJECT)
-	ar cr $@ $(OBJECT)
-	$(RANLIB) $@
-	echo $(EXTRALIBS) >> $(TOP)/ext.libs
+$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP)
+	@$(MKPATH) $(INST_AUTODIR)
+	$(ARMAYBE) cr $(BASEEXT).a $(OBJECT) 
+	ld $(LDDLFLAGS) -o $@ $(LDTARGET) $(OTHERLDFLAGS) $(MYEXTLIB) $(LDLOADLIBS)
 ';
 }
 
 
-sub c {
+# --- Static Loading Sections ---
+
+sub static {
     '
-$(BASEEXT).c:	$(BASEEXT).xs $(XSUBPP) $(TOP)/ext/typemap $(EXTTYPEMAP) $(TOP)/cflags
-	$(PERL) $(XSUBPP) $(BASEEXT).xs >tmp
-	mv tmp $@
+# $(INST_PM) has been moved to the all: target.
+# It remains here for awhile to allow for old usage: "make static"
+static :: $(INST_STATIC) $(INST_PM) 
 ';
 }
 
+sub static_lib{
+    my(@m);
+    push(@m, <<'END');
+$(INST_STATIC): $(OBJECT) $(MYEXTLIB)
+END
+    # If this extension has it's own library (eg SDBM_File)
+    # then copy that to $(INST_STATIC) and add $(OBJECT) into it.
+    push(@m, '	cp $(MYEXTLIB) $@'."\n") if $att{MYEXTLIB};
+
+    push(@m, <<'END');
+	ar cr $@ $(OBJECT) && $(RANLIB) $@
+	@: Old mechanism - still needed:
+	echo $(EXTRALIBS) >> $(PERL_SRC)/ext.libs
+	@: New mechanism - not yet used:
+	echo $(EXTRALIBS) > $(INST_ARCHAUTODIR)/extralibs.ld
+	cp $@ $(INST_ARCHAUTODIR)/
+END
+    join('', "\n",@m);
+}
+
 
 sub installpm {
-    '
-$(INST_PM):	$(BASEEXT).pm
-	@$(MKPATH) $(TOP)/lib/$(ROOTEXT)
-	rm -f $@
-	cp $(BASEEXT).pm $@
-	@$(AUTOSPLITLIB) $(EXTMODNAME)
-';
+    my($self, %attribs) = @_;
+    # By default .pm files are split into the architecture independent
+    # library. This is a good thing. If a specific module requires that
+    # it's .pm files are split into the architecture specific library
+    # then it should use: installpm => {SPLITLIB=>'$(INST_ARCHLIB)'}
+    # Note that installperl currently interferes with this (Config.pm)
+    # User can disable split by saying: installpm => {SPLITLIB=>''}
+    my($splitlib) = '$(INST_LIB)'; # NOT arch specific by default
+    $splitlib = $attribs{SPLITLIB} if exists $attribs{SPLITLIB};
+    my(@m, $dist);
+    foreach $dist (sort keys %{$att{PM}}){
+	my($inst) = $att{PM}->{$dist};
+	push(@m, "\n# installpm: $dist => $inst, splitlib=$splitlib\n");
+	push(@m, MY->installpm_x($dist, $inst, $splitlib));
+	push(@m, "\n");
+    }
+    join('', @m);
 }
 
+sub installpm_x { # called by installpm per file
+    my($self, $dist, $inst, $splitlib) = @_;
+    my($instdir) = $inst =~ m|(.*)/|;
+    my(@m);
+    push(@m,"
+$inst: $dist
+".'	@rm -f $@
+	@$(MKPATH) '.$instdir.'
+	cp $? $@
+');
+    push(@m, "\t\$(AUTOSPLITFILE) \$@ $splitlib/auto\n")
+	if ($splitlib and $inst =~ m/\.pm$/);
+    join('', @m);
+}
 
-sub clean {
-    '
-clean::
-	rm -f *.o *.a mon.out core $(BASEEXT).c so_locations
-	rm -f makefile Makefile $(BOOTSTRAP) $(BASEEXT).bso '.$att{'clean_files'}.'
-';
+
+# --- Sub-directory Sections ---
+
+sub subdirs {
+    my(@m);
+    # This method provides a mechanism to automatically deal with
+    # subdirectories containing further Makefile.PL scripts.
+    # It calls the subdir_x() method for each subdirectory.
+    foreach(<*/Makefile.PL>){
+	s:/Makefile\.PL$:: ;
+	print "Including $_ subdirectory" if ($Verbose);
+	push(@m, MY->subdir_x($_));
+    }
+    if (@m){
+	unshift(@m, "
+# The default clean, realclean and test targets in this Makefile
+# have automatically been given entries for each subdir.
+
+all :: subdirs
+");
+    } else {
+	push(@m, "\n# none")
+    }
+    join('',@m);
+}
+
+sub runsubdirpl{	# Experimental! See subdir_x section
+    my($self,$subdir) = @_;
+    chdir($subdir) or die "chdir($subdir): $!";
+    require "Makefile.PL";
 }
 
+sub subdir_x {
+    my($self, $subdir) = @_;
+    my(@m);
+    # The intention is that the calling Makefile.PL should define the
+    # $(SUBDIR_MAKEFILE_PL_ARGS) make macro to contain whatever
+    # information needs to be passed down to the other Makefile.PL scripts.
+    # If this does not suit your needs you'll need to write your own
+    # MY::subdir_x() method to override this one.
+    qq{
+config :: $subdir/Makefile
+	cd $subdir ; \$(MAKE) config LINKTYPE=\$(LINKTYPE)
+
+$subdir/Makefile: $subdir/Makefile.PL \$(CONFIGDEP)
+}.'	@echo "Rebuilding $@ ..."
+	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) \\
+		-e "use ExtUtils::MakeMaker; MM->runsubdirpl(qw('.$subdir.'))" \\
+		$(SUBDIR_MAKEFILE_PL_ARGS)
+	@echo "Rebuild of $@ complete."
+'.qq{
+
+subdirs ::
+	cd $subdir ; \$(MAKE) all LINKTYPE=\$(LINKTYPE)
+
+};
+}
+
+
+# --- Cleanup and Distribution Sections ---
+
+sub clean {
+    my($self, %attribs) = @_;
+    my(@m);
+    push(@m, '
+# Delete temporary files but do not touch installed files. We don\'t delete
+# the Makefile here so a later make realclean still has a makefile to use.
+
+clean ::
+');
+    # clean subdirectories first
+    push(@m, map("\t-cd $_ && test -f Makefile && \$(MAKE) clean\n",@{$att{DIR}}));
+    push(@m, "	rm -f *~ t/*~ *.o *.a mon.out core so_locations \$(BOOTSTRAP) \$(BASEEXT).bso\n");
+    my(@otherfiles);
+    # Automatically delete the .c files generated from *.xs files:
+    push(@otherfiles, values %{$att{XS}});
+    push(@otherfiles, $attribs{FILES}) if $attribs{FILES};
+    push(@m, "	rm -rf @otherfiles\n") if @otherfiles;
+    push(@m, "	$attribs{POSTOP}\n")   if $attribs{POSTOP};
+    join("", @m);
+}
 
 sub realclean {
-    '
-realclean:: 	clean
-	rm -f $(INST_DYNAMIC) $(INST_STATIC) $(INST_BOOT)
-	rm -rf $(INST_PM) $(AUTOEXT) '.$att{'realclean_files'}.'
+    my($self, %attribs) = @_;
+    my(@m);
+    push(@m,'
+# Delete temporary files (via clean) and also delete installed files
+realclean purge ::  clean
+');
+    # clean subdirectories first
+    push(@m, map("\t-cd $_ && test -f Makefile && \$(MAKE) realclean\n",@{$att{DIR}}));
+    push(@m, '	rm -f Makefile $(INST_DYNAMIC) $(INST_STATIC) $(INST_BOOT) $(INST_PM)'."\n");
+    push(@m, '	rm -rf $(INST_AUTODIR) $(INST_ARCHAUTODIR)'."\n");
+    my(@otherfiles);
+    push(@otherfiles, $attribs{FILES}) if $attribs{FILES};
+    push(@m, "	rm -rf @otherfiles\n") if @otherfiles;
+    push(@m, "	$attribs{POSTOP}\n")       if $attribs{POSTOP};
+    join("", @m);
+}
 
-purge:	realclean
-';
+
+sub distclean {
+    my($self, %attribs) = @_;
+    # VERSION should be sanitised before use as a file name
+    my($tarname)  = $attribs{TARNAME}  || '$(DISTNAME)-$(VERSION)';
+    my($tarflags) = $attribs{TARFLAGS} || 'cvf';
+    my($compress) = $attribs{COMPRESS} || 'compress'; # eg gzip
+    my($preop)    = $attribs{PREOP}  || '@:'; # e.g., update MANIFEST
+    my($postop)   = $attribs{POSTOP} || '@:';
+    my($mkfiles)  = join(' ', map("$_/Makefile", ".", @{$att{DIR}}));
+    "
+distclean:     clean
+	$preop
+	rm -f $mkfiles
+	cd ..; tar $tarflags $tarname.tar \$(BASEEXT)
+	cd ..; $compress $tarname.tar
+	$postop
+";
 }
 
 
+# --- Test and Installation Sections ---
+
 sub test {
-    '
-test: all
-	$(FULLPERL) -I$(TOP)/lib -e \'use Test::Harness; runtests @ARGV;\' t/*.t
-';
+    my($self, %attribs) = @_;
+    my($tests) = $attribs{TESTS} || (-d "t" ? "t/*.t" : "");
+    my(@m);
+    push(@m,"
+test :: all
+");
+    push(@m, <<"END") if $tests;
+	\$(FULLPERL) -I\$(PERL_ARCHLIB) -I\$(PERL_LIB) -e 'use Test::Harness; runtests \@ARGV;' $tests
+END
+    push(@m, <<'END') if -f "test.pl";
+	$(FULLPERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) test.pl
+END
+    push(@m, map("\tcd $_ && test -f Makefile && \$(MAKE) test LINKTYPE=\$(LINKTYPE)\n",@{$att{DIR}}));
+    push(@m, "\t\@echo 'No tests defined for \$(NAME) extension.'\n") unless @m > 1;
+    join("", @m);
 }
 
 
 sub install {
     '
-# used if installperl will not be installing it for you
-install:: all
-	# not yet defined
+install :: all
+	# install is not defined. Makefile, by default, builds the extension
+	# directly into $(INST_LIB) so "installing" does not make much sense.
+	# If INST_LIB is in the perl source tree then installperl will install
+	# the extension when it installs perl.
 ';
 }
 
 
-sub distclean {
-    my($tarflags) = $att{'distclean_tarflags'} || 'cvf';
-    '
-distclean:     clean
-	rm -f Makefile *~ t/*~
-	cd ..; tar '.$tarflags.' "$(DISTNAME)-$(VERSION).tar" $(BASEEXT)
-	cd ..; compress "$(DISTNAME)-$(VERSION).tar"
+sub force {
+    '# Phony target to force checking subdirectories.
+FORCE:
 ';
 }
 
 
 sub perldepend {
+	my(@m);
+    push(@m,'
+PERL_HDRS = $(PERL_INC)/EXTERN.h $(PERL_INC)/INTERN.h \
+    $(PERL_INC)/XSUB.h	$(PERL_INC)/av.h	$(PERL_INC)/cop.h \
+    $(PERL_INC)/cv.h	$(PERL_INC)/dosish.h	$(PERL_INC)/embed.h \
+    $(PERL_INC)/form.h	$(PERL_INC)/gv.h	$(PERL_INC)/handy.h \
+    $(PERL_INC)/hv.h	$(PERL_INC)/keywords.h	$(PERL_INC)/mg.h \
+    $(PERL_INC)/op.h	$(PERL_INC)/opcode.h	$(PERL_INC)/patchlevel.h \
+    $(PERL_INC)/perl.h	$(PERL_INC)/perly.h	$(PERL_INC)/pp.h \
+    $(PERL_INC)/proto.h	$(PERL_INC)/regcomp.h	$(PERL_INC)/regexp.h \
+    $(PERL_INC)/scope.h	$(PERL_INC)/sv.h	$(PERL_INC)/unixish.h \
+    $(PERL_INC)/util.h
+
+$(OBJECT) : $(PERL_HDRS)
+');
+	# Don't output this if PERL_SRC not available:
+    push(@m,'
+$(PERL_INC)/config.h: $(PERL_SRC)/config.sh; cd $(PERL_SRC); /bin/sh config_h.SH
+$(PERL_INC)/embed.h:  $(PERL_SRC)/config.sh; cd $(PERL_SRC); /bin/sh embed_h.SH
+');
+    # This needs a better home:
+    push(@m, join(" ", values %{$att{XS}})." : \$(XSUBPPDEPS)\n")
+	if %{$att{XS}};
+    join("\n",@m);
+}
+
+
+sub makefile {
+    # We do not know what target was originally specified so we
+    # must force a manual rerun to be sure. But as it would only
+    # happen very rarely it is not a significant problem.
     '
 $(OBJECT) : Makefile
-$(OBJECT) : $(TOP)/EXTERN.h
-$(OBJECT) : $(TOP)/INTERN.h
-$(OBJECT) : $(TOP)/XSUB.h
-$(OBJECT) : $(TOP)/av.h
-$(OBJECT) : $(TOP)/cop.h
-$(OBJECT) : $(TOP)/cv.h
-$(OBJECT) : $(TOP)/dosish.h
-$(OBJECT) : $(TOP)/embed.h
-$(OBJECT) : $(TOP)/form.h
-$(OBJECT) : $(TOP)/gv.h
-$(OBJECT) : $(TOP)/handy.h
-$(OBJECT) : $(TOP)/hv.h
-$(OBJECT) : $(TOP)/keywords.h
-$(OBJECT) : $(TOP)/mg.h
-$(OBJECT) : $(TOP)/op.h
-$(OBJECT) : $(TOP)/opcode.h
-$(OBJECT) : $(TOP)/patchlevel.h
-$(OBJECT) : $(TOP)/perl.h
-$(OBJECT) : $(TOP)/perly.h
-$(OBJECT) : $(TOP)/pp.h
-$(OBJECT) : $(TOP)/proto.h
-$(OBJECT) : $(TOP)/regcomp.h
-$(OBJECT) : $(TOP)/regexp.h
-$(OBJECT) : $(TOP)/scope.h
-$(OBJECT) : $(TOP)/sv.h
-$(OBJECT) : $(TOP)/unixish.h
-$(OBJECT) : $(TOP)/util.h
-$(TOP)/config.h:        $(TOP)/config.sh; cd $(TOP); /bin/sh config_h.SH
-$(TOP)/embed.h: $(TOP)/config.sh; cd $(TOP); /bin/sh embed_h.SH
-$(TOP)/cflags:  $(TOP)/config.sh; cd $(TOP); /bin/sh cflags.SH
-
-Makefile:	Makefile.PL
-	$(PERL) -I$(TOP)/lib Makefile.PL
+
+Makefile:	Makefile.PL $(CONFIGDEP)
+	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) Makefile.PL
+	@echo "Now you must rerun make."; false
 ';
 }
 
@@ -593,52 +1370,212 @@ sub postamble{
 }
 
 
-sub finish {
-    chmod 0644, "Makefile";
-    system("$Config{'eunicefix'} Makefile") unless $Config{'eunicefix'} eq ":";
+# --- Determine libraries to use and how to use them ---
+
+sub extliblist{
+    my($self, $libs) = @_;
+    return ("", "", "") unless $libs;
+    print STDERR "Potential libraries are '$libs':" if $Verbose;
+    my(@old) = MY->old_extliblist($libs);
+    my(@new) = MY->new_extliblist($libs);
+
+    my($oldlibs) = join(" : ",@old);
+    my($newlibs) = join(" : ",@new);
+    warn "Warning (non-fatal): $att{NAME} extliblist consistency check failed:\n".
+	"  old: $oldlibs\n".
+	"  new: $newlibs\n".
+	"Using 'new' set. Please notify perl5-porters\@isu.edu.\n"
+	    if "$newlibs" ne "$oldlibs";
+    @new;
 }
 
 
+sub old_extliblist {
+    my($self, $potential_libs)=@_;
+    return ("", "", "") unless $potential_libs;
+
+    my(%attrib, @w);
+    # Now run ext/util/extliblist to discover what *libs definitions
+    # are required for the needs of $potential_libs
+    $ENV{'potential_libs'} = $potential_libs;
+    my(@o)=`. $att{PERL_SRC}/config.sh
+	    . $att{PERL_SRC}/ext/util/extliblist;
+	    echo EXTRALIBS=\$extralibs
+	    echo BSLOADLIBS=\$dynaloadlibs
+	    echo LDLOADLIBS=\$statloadlibs
+	    `;
+    foreach $line (@o){
+	chomp $line;
+	if ($line =~ /(.*)\s*=\s*(.*)\s*$/){
+	    $attrib{$1} = $2;
+	    print STDERR "	$1 = $2" if $Verbose;
+	}else{
+	    push(@w, $line);
+	}
+    }
+    print STDERR "Messages from extliblist:\n", join("\n",@w,'')
+       if @w ;
+    @attrib{qw(EXTRALIBS BSLOADLIBS LDLOADLIBS)};
+}
+
+
+sub new_extliblist {
+    my($self, $potential_libs)=@_;
+    return ("", "", "") unless $potential_libs;
+
+    my($so)   = $Config{'so'};
+    my($libs) = $Config{'libs'};
+
+    # compute $extralibs, $bsloadlibs and $ldloadlibs from
+    # $potential_libs
+    # this is a rewrite of Andy Dougherty's extliblist in perl
+    # its home is in <distribution>/ext/util
+
+    my(@searchpath); # from "-L/path" entries in $potential_libs
+    my(@libpath) = split " ", $Config{'libpth'};
+    my(@ldloadlibs);
+    my(@bsloadlibs);
+    my(@extralibs);
+    my($fullname);
+    my($pwd) = fastcwd(); # from Cwd.pm
+
+    foreach $thislib (split ' ', $potential_libs){
+
+	# Handle possible linker path arguments.
+	if ($thislib =~ s/^(-[LR])//){	# save path flag type
+	    my($ptype) = $1;
+	    unless (-d $thislib){
+		warn "$ptype$thislib ignored, directory does not exist\n"
+			if $Verbose;
+		next;
+	    }
+	    if ($thislib !~ m|^/|) {
+	      warn "Warning: $ptype$thislib changed to $ptype$pwd/$thislib\n";
+	      $thislib = "$pwd/$thislib";
+	    }
+	    push(@searchpath, $thislib);
+	    push(@extralibs,  "$ptype$thislib");
+	    push(@ldloadlibs, "$ptype$thislib");
+	    next;
+	}
+
+	# Handle possible library arguments.
+	unless ($thislib =~ s/^-l//){
+	  warn "Unrecognized argument in LIBS ignored: '$thislib'\n";
+	  next;
+	}
+
+	my($found_lib)=0;
+	foreach $thispth (@searchpath, @libpath){
+
+	    if (@fullname=<${thispth}/lib${thislib}.${so}.[0-9]*>){
+		$fullname=$fullname[-1]; #ATTN: 10 looses against 9!
+	    } elsif (-f ($fullname="$thispth/lib$thislib.$so")){
+	    } elsif (-f ($fullname="$thispth/lib${thislib}_s.a")){
+	    } elsif (-f ($fullname="$thispth/lib$thislib.a")){
+	    } elsif (-f ($fullname="$thispth/Slib$thislib.a")){
+	    } else { 
+		warn "$thislib not found in $thispth\n" if $Verbose;
+		next;
+	    }
+	    warn "'-l$thislib' found at $fullname\n" if $Verbose;
+	    $found_lib++;
+
+	    # Now update library lists
+
+	    # what do we know about this library...
+	    my $is_dyna = ($fullname !~ /\.a$/);
+	    my $in_perl = ($libs =~ /\B-l${thislib}\b|\B-l${thislib}_s\b/s);
+
+	    # Do not add it into the list if it is already linked in
+	    # with the main perl executable.
+	    # We have to special-case the NeXT, because all the math is also in libsys_s
+	    unless ( $in_perl || ($Config{'osname'} eq 'next' && $thislib eq 'm') ){
+		push(@extralibs, "-l$thislib");
+	    }
+			
+
+	    # We might be able to load this archive file dynamically
+	    if ( $Config{'dlsrc'} =~ /dl_next|dl_dld/){
+		# We push -l$thislib instead of $fullname because
+		# it avoids hardwiring a fixed path into the .bs file.
+		# mkbootstrap will automatically add dl_findfile() to
+		# the .bs file if it sees a name in the -l format.
+		# USE THIS LATER: push(@bsloadlibs, "-l$thislib"); # " $fullname";
+		# USE THIS while checking results against old_extliblist
+		push(@bsloadlibs, "$fullname");
+	    } else {
+		if ($is_dyna){
+                    # For SunOS4, do not add in this shared library if
+                    # it is already linked in the main perl executable
+		    push(@ldloadlibs, "-l$thislib")
+			unless ($in_perl and $Config{'osname'} eq 'sunos');
+		} else {
+		    push(@ldloadlibs, "-l$thislib");
+		}
+	    }
+	    last;	# found one here so don't bother looking further
+	}
+	warn "Warning (non-fatal): No library found for -l$thislib\n" unless $found_lib>0;
+    }
+    ("@extralibs", "@bsloadlibs", "@ldloadlibs");
+}
+
+
+# --- Write a DynaLoader bootstrap file if required
 
 sub mkbootstrap {
-#
-# mkbootstrap, by:
-#
-#	Andreas Koenig <k@otto.ww.TU-Berlin.DE>
-#	Tim Bunce <Tim.Bunce@ig.co.uk>
-#	Andy Dougherty <doughera@lafcol.lafayette.edu>
-#
-#  This perl script attempts to make a bootstrap file for use by this
-#  system's DynaLoader. It typically gets called from an extension
-#  Makefile.
-#
-# There is no .bs file supplied with the extension. Instead a _BS
-# file which has code for the special cases, like posix for berkeley db
-# on the NeXT.
-# 
-# This file will get parsed, and produce a maybe empty
-# @DynaLoader::dl_resolve_using array for the current architecture.
-# That will be extended by $dynaloadlibs, which was computed by Andy's
-# extliblist script. If this array still is empty, we do nothing, else
-# we write a .bs file with an @DynaLoader::dl_resolve_using array, but
-# without any `if's, because there is no longer a need to deal with
-# special cases.
-# 
-# The _BS file can put some code into the generated .bs file by placing
-# it in $bscode. This is a handy 'escape' mechanism that may prove
-# useful in complex situations.
-# 
-# If @DynaLoader::dl_resolve_using contains -L* or -l* entries then
-# mkbootstrap will automatically add a dl_findfile() call to the
-# generated .bs file.
-#
-    my($self, @dynaloadlibs)=@_;
-    print STDERR "	dynaloadlibs=@dynaloadlibs" if $Verbose;
-    require DynaLoader; # we need DynaLoader, if the *_BS gets interpreted
-    import DynaLoader;  # we don't say `use', so if DynaLoader is not 
-	          # yet built MakeMaker works nonetheless except here
 
-    &initialize unless defined $att{'perl'};
+=head1 NAME
+
+mkbootstrap
+
+=head1 DESCRIPTION
+
+Make a bootstrap file for use by this system's DynaLoader.
+It typically gets called from an extension Makefile.
+
+There is no .bs file supplied with the extension. Instead a _BS file
+which has code for the special cases, like posix for berkeley db on the
+NeXT.
+
+This file will get parsed, and produce a maybe empty
+@DynaLoader::dl_resolve_using array for the current architecture.
+That will be extended by $BSLOADLIBS, which was computed by Andy's
+extliblist script. If this array still is empty, we do nothing, else
+we write a .bs file with an @DynaLoader::dl_resolve_using array, but
+without any C<if>s, because there is no longer a need to deal with
+special cases.
+
+The _BS file can put some code into the generated .bs file by placing
+it in $bscode. This is a handy 'escape' mechanism that may prove
+useful in complex situations.
+
+If @DynaLoader::dl_resolve_using contains C<-L*> or C<-l*> entries then
+mkbootstrap will automatically add a dl_findfile() call to the
+generated .bs file.
+
+=head1 AUTHORS
+
+Andreas Koenig <k@otto.ww.TU-Berlin.DE>, Tim Bunce
+<Tim.Bunce@ig.co.uk>, Andy Dougherty <doughera@lafcol.lafayette.edu>
+
+=cut
+
+    my($self, @bsloadlibs)=@_;
+
+    @bsloadlibs = grep($_, @bsloadlibs); # strip empty libs
+
+    print STDERR "	bsloadlibs=@bsloadlibs\n" if $Verbose;
+
+    # We need DynaLoader here because we and/or the *_BS file may
+    # call dl_findfile(). We don't say `use' here because when
+    # first building perl extensions the DynaLoader will not have
+    # been built when MakeMaker gets first used.
+    require DynaLoader;
+    import DynaLoader;
+
+    initialize(@ARGV) unless defined $att{'BASEEXT'};
 
     rename "$att{BASEEXT}.bs", "$att{BASEEXT}.bso";
 
@@ -646,10 +1583,11 @@ sub mkbootstrap {
 	$_ = "$att{BASEEXT}_BS";
 	package DynaLoader; # execute code as if in DynaLoader
 	local($osname, $dlsrc) = (); # avoid warnings
-	($osname, $dlsrc) = @Config{qw(osname dlsrc)};
+	($osname, $dlsrc) = @Config::Config{qw(osname dlsrc)};
 	$bscode = "";
 	unshift @INC, ".";
 	require $_;
+	shift @INC;
     }
 
     if ($Config{'dlsrc'} =~ /^dl_dld/){
@@ -657,7 +1595,7 @@ sub mkbootstrap {
 	push(@dl_resolve_using, dl_findfile('-lc'));
     }
 
-    my(@all) = (@dynaloadlibs, @DynaLoader::dl_resolve_using);
+    my(@all) = (@bsloadlibs, @DynaLoader::dl_resolve_using);
     my($method) = '';
     if (@all){
 	open BS, ">$att{BASEEXT}.bs"
@@ -669,26 +1607,41 @@ sub mkbootstrap {
 	print BS "# This file was automatically generated by the\n";
 	print BS "# mkbootstrap routine in ExtUtils/MakeMaker.pm.\n";
 	print BS "\@DynaLoader::dl_resolve_using = ";
-	if (" @all" =~ m/ -[lL]/){
+	# If @all contains names in the form -lxxx or -Lxxx then it's asking for
+	# runtime library location so we automatically add a call to dl_findfile()
+	if (" @all" =~ m/ -[lLR]/){
 	    print BS "  dl_findfile(qw(\n  @all\n  ));\n";
 	}else{
 	    print BS "  qw(@all);\n";
 	}
 	# write extra code if *_BS says so
 	print BS $DynaLoader::bscode if $DynaLoader::bscode;
-	print BS "1;\n";
+	print BS "\n1;\n";
 	close BS;
     }
 
+    # special handling for systems which needs a list of all global
+    # symbols exported by a modules to be dynamically linked.
     if ($Config{'dlsrc'} =~ /^dl_aix/){
-       open AIX, ">$att{BASEEXT}.exp";
-       print AIX "#!\nboot_$att{BASEEXT}\n";
-       close AIX;
+       my($bootfunc);
+       ($bootfunc = $att{NAME}) =~ s/\W/_/g;
+       open EXP, ">$att{BASEEXT}.exp";
+       print EXP "#!\nboot_$bootfunc\n";
+       close EXP;
     }
 }
 
-# the following makes AutoSplit happy (bug in perl5b3e)
+
+# --- Output postprocessing section ---
+#nicetext is included to make VMS support easier
+sub nicetext { # Just return the input - no action needed
+    my($self,$text) = @_;
+    $text;
+}
+ 
+# the following keeps AutoSplit happy
 package ExtUtils::MakeMaker;
 1;
 
 __END__
+