X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdarwin.sh;h=33d594ca2ad70ee24d1f45f0e200d0fb55797ea5;hb=8e4985cd06cac8609b7c84aab08fe2d8d20f9526;hp=34de8673e89ea8f3ca03bffc33b4bb77063d51ce;hpb=39225f5c712b7c912695bc38ab029bc2998beff8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/darwin.sh b/hints/darwin.sh
index 34de867..33d594c 100644
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -35,6 +35,18 @@ case "$prefix" in
     sitelib="/Library/Perl/${version}"; # FIXME: Want "/Network/Perl/${version}" also
     vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
     ;;
+
+  *)
+    # Anything else; use non-system directories
+    # prefix=$prefix; # Built-in perl uses /usr
+    siteprefix=$prefix;
+    vendorprefix='/usr'; usevendorprefix='define';
+
+    # Where to put modules.
+    sitelib=$prefix/lib/perl5/site_perl/${version}
+    vendorlib="/System/Library/Perl/${version}"; # Apple-supplied modules
+    ;;
+
 esac
 
 # 4BSD uses ${prefix}/share/man, not ${prefix}/man.
@@ -71,7 +83,10 @@ esac
 
 # -pipe: makes compilation go faster.
 # -fno-common because common symbols are not allowed in MH_DYLIB
-ccflags="${ccflags} -pipe -fno-common"
+# -DDARWIN: apparently the __APPLE__ is not sanctioned by Apple
+# as the way to differentiate Mac OS X.  (The official line is that
+# *no* cpp symbol does differentiate Mac OS X.)
+ccflags="${ccflags} -pipe -fno-common -DDARWIN"
 
 # At least on Darwin 1.3.x:
 #
@@ -141,9 +156,7 @@ esac
 ldlibpthname='DYLD_LIBRARY_PATH';
 
 # useshrplib=true results in much slower startup times.
-case "$useshrplib" in
-'') useshrplib='false' ;;
-esac
+# 'false' is the default value.  Use Configure -Duseshrplib to override.
 
 cat > UU/archname.cbu <<'EOCBU'
 # This script UU/archname.cbu will get 'called-back' by Configure