From: Nicholas Clark <nick@ccl4.org>
Date: Mon, 8 Sep 2008 20:16:02 +0000 (+0000)
Subject: Cross-propagate changes between make_ext and make_ext_cross.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e37e15afdcc8f08e993ebae0fd343b1a4fdf1e75;p=p5sagit%2Fp5-mst-13.2.git

Cross-propagate changes between make_ext and make_ext_cross.
Hopefully we can heal the code fork soon.

p4raw-id: //depot/perl@34321
---

diff --git a/ext/util/make_ext b/ext/util/make_ext
index 413b2e0..6152aa8 100644
--- a/ext/util/make_ext
+++ b/ext/util/make_ext
@@ -65,7 +65,7 @@ ext*)	# Remove ext/ prefix and /pm_to_blib suffix
 	pname=`echo "$extspec" | sed -e 's:^ext/::' -e 's:/pm_to_blib$::' ` ;;
 *::*)	# Convert :: to /
 	pname=`echo "$extspec" | sed -e 's/::/\//g' ` ;;
-*.o)    pname=`echo "$extspec" | sed -e 's/\.o//'` ;;
+*.*o)    pname=`echo "$extspec" | sed -e 's/\..*o//'` ;;
 *)	pname="$extspec" ;;
 esac
 # echo "Converted $extspec to $pname"
diff --git a/ext/util/make_ext_cross b/ext/util/make_ext_cross
index 4bbfae3..b89c8e7 100644
--- a/ext/util/make_ext_cross
+++ b/ext/util/make_ext_cross
@@ -82,6 +82,12 @@ if test ! -d "ext/$pname"; then
     exit 0 # not an error ?
 fi
 
+case "$osname" in
+catamount) # Snowball's chance of building extensions.
+  echo "This is $osname, not building $mname, sorry."
+  exit 0
+  ;;
+esac
 
 echo "	Making $mname ($target)"
 
@@ -121,7 +127,7 @@ nonxs)      makeargs="";
 esac
 
 if test ! -f $makefile ; then
-	test -f Makefile.PL && ../$depth/miniperl -I../$depth/lib -MCross Makefile.PL INSTALLDIRS=perl PERL_CORE=1 $passthru
+	test -f Makefile.PL && $run ../$depth/miniperl -I../$depth/lib -MCross Makefile.PL INSTALLDIRS=perl INSTALLMAN3DIR=none PERL_CORE=1 $passthru
 fi
 if test ! -f $makefile ; then
 	echo "Warning: No Makefile!"