X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FSDBM_File%2FMakefile.PL;h=1267efc859e6cf8ade78e02dd4691933cf1da9a1;hb=8fdbae25099b33d6035cb6e295622a0580c070a1;hp=bff3e7b3bcd2a9fb1888e35967bfdba036f98c88;hpb=e601c439adce167078ac7b49550c0418ace86f94;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/SDBM_File/Makefile.PL b/ext/SDBM_File/Makefile.PL
index bff3e7b..1267efc 100644
--- a/ext/SDBM_File/Makefile.PL
+++ b/ext/SDBM_File/Makefile.PL
@@ -1,13 +1,17 @@
 use ExtUtils::MakeMaker;
-use Config;
+use Config;
 
 # 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.
 
+# Work around: Darwin ppc64 bug ignores archive contents when building bundles
+
 $define = ($^O eq 'MSWin32') ? '-DMSDOS' : '';
 if ($^O eq 'MSWin32') { $myextlib = 'sdbm\\libsdbm$(LIB_EXT)'; }
+elsif ($^O eq 'darwin' && $Config{'ldflags'} =~/-arch ppc64/) {
+                        $myextlib = '-all_load sdbm/libsdbm$(LIB_EXT)'; }
 else                  { $myextlib = 'sdbm/libsdbm$(LIB_EXT)';  }
 
 WriteMakefile(
@@ -21,27 +25,27 @@ WriteMakefile(
              );
 
 sub MY::postamble {
-  if ($^O =~ /MSWin32/ && Win32::IsWin95()) {
-	if ($Config{'make'} =~ /dmake/i) {
-	    # dmake-specific
-	    return <<EOT;
+  if ($^O =~ /MSWin32/ && !defined($ENV{SYSTEMROOT})) {
+	if ($Config{'make'} =~ /dmake/i) {
+	    # dmake-specific
+	    return <<'EOT';
 $(MYEXTLIB): sdbm/Makefile
 @[
 	cd sdbm
 	$(MAKE) all
 	cd ..
 ]
-EOT
-	} elsif ($Config{'make'} =~ /nmake/i) {
-	    #
-	    return <<'EOT';
-$(MYEXTLIB): sdbm/Makefile
-	cd sdbm
-	$(MAKE) all
-	cd ..
-EOT
-	} 
-  } elsif ($^O ne 'VMS') {
+EOT
+	} elsif ($Config{'make'} =~ /nmake/i) {
+	    #
+	    return <<'EOT';
+$(MYEXTLIB): sdbm/Makefile
+	cd sdbm
+	$(MAKE) all
+	cd ..
+EOT
+	} 
+} elsif ($^O ne 'VMS') {
     '
 $(MYEXTLIB): sdbm/Makefile
 	cd sdbm && $(MAKE) all