X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Frhapsody.sh;h=96d57f241260e334b53bcb363e1c2cb227aac8c2;hb=11264fdb092cd4874ac94ff361c9d4e20753485f;hp=e4e620284fe5ba93614d9dabafcf0849d814e734;hpb=437cf18808fc508c7e03cae0f2d2beec3d718651;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/rhapsody.sh b/hints/rhapsody.sh
index e4e6202..96d57f2 100644
--- a/hints/rhapsody.sh
+++ b/hints/rhapsody.sh
@@ -8,19 +8,24 @@
 ##
 
 # BSD paths
-prefix='/usr';
-siteprefix='/usr/local';
-vendorprefix='/usr/local'; usevendorprefix='define';
+case "$prefix" in
+'')	
+	prefix='/usr/local'; # Built-in perl uses /usr
+	siteprefix='/usr/local';
+	vendorprefix='/usr/local'; usevendorprefix='define';
 
-# 4BSD uses /usr/share/man, not /usr/man.
-# Don't put man pages in /usr/lib; that's goofy.
-man1dir='/usr/share/man/man1';
-man3dir='/usr/share/man/man3';
+	# 4BSD uses ${prefix}/share/man, not ${prefix}/man.
+	# Don't put man pages in ${prefix}/lib; that's goofy.
+	man1dir="${prefix}/share/man/man1";
+	man3dir="${prefix}/share/man/man3";
 
-# Where to put modules.
-privlib='/System/Library/Perl';
-sitelib='/Local/Library/Perl';
-vendorlib='/Network/Library/Perl';
+	# Where to put modules.
+	# Built-in perl uses /System/Library/Perl
+	privlib='/Local/Library/Perl';
+	sitelib='/Local/Library/Perl';
+	vendorlib='/Network/Library/Perl';
+	;;
+esac
 
 ##
 # Tool chain settings
@@ -38,8 +43,11 @@ libc='/System/Library/Frameworks/System.framework/System';
 # Optimize.
 optimize='-O3';
 
-# We have a prototype for telldir.
-ccflags="${ccflags} -pipe -fno-common -DHAS_TELLDIR_PROTOTYPE";
+# XXX Unclear why we require -pipe and -fno-common here.
+ccflags="${ccflags} -pipe -fno-common"
+
+# cpp-precomp is problematic.
+cppflags='-traditional-cpp';
 
 # Shared library extension is .dylib.
 # Bundle extension is .bundle.
@@ -63,7 +71,7 @@ usevfork='true';
 # malloc works
 usemymalloc='n';
 
-# HFS+ will throw "make depend" into confusion since
-# Makefile and makefile are the same.
+# Case-insensitive filesystems don't get along with Makefile and
+# makefile in the same place.  Since Darwin uses GNU make, this dodges
+# the problem.
 firstmakefile=GNUmakefile;
-