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

diff --git a/hints/rhapsody.sh b/hints/rhapsody.sh
index c564c88..96d57f2 100644
--- a/hints/rhapsody.sh
+++ b/hints/rhapsody.sh
@@ -1,59 +1,77 @@
 ##
 # Rhapsody (Mac OS X Server) hints
-# Wilfredo Sanchez <wsanchez@apple.com>
+# Wilfredo Sanchez <wsanchez@mit.edu>
 ##
 
-# Since we can build fat, the archname doesn't need the processor type
-archname='rhapsody';
+##
+# Paths
+##
 
-# Perl5.003 precedes this platform
-d_bincompat3='undef';
+# BSD paths
+case "$prefix" in
+'')	
+	prefix='/usr/local'; # Built-in perl uses /usr
+	siteprefix='/usr/local';
+	vendorprefix='/usr/local'; usevendorprefix='define';
 
-# Libc is in libsystem.
-libc='/System/Library/Frameworks/System.framework/System';
+	# 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.
+	# Built-in perl uses /System/Library/Perl
+	privlib='/Local/Library/Perl';
+	sitelib='/Local/Library/Perl';
+	vendorlib='/Network/Library/Perl';
+	;;
+esac
+
+##
+# Tool chain settings
+##
+
+# Since we can build fat, the archname doesn't need the processor type
+archname='rhapsody';
 
 # nm works.
 usenm='true';
+  
+# Libc is in libsystem.
+libc='/System/Library/Frameworks/System.framework/System';
 
 # Optimize.
 optimize='-O3';
 
-# We have a prototype for telldir.
-# We are not NeXTStep.
-ccflags="${ccflags} -pipe -fno-common -DHAS_TELLDIR_PROTOTYPE -UNeXT -U__NeXT__";
+# XXX Unclear why we require -pipe and -fno-common here.
+ccflags="${ccflags} -pipe -fno-common"
 
-# Don't use /usr/local/lib; we may have junk there.
-libpth='/lib /usr/lib';
+# cpp-precomp is problematic.
+cppflags='-traditional-cpp';
 
-# Shared library extension in .dylib.
-# Bundle extension in .bundle.
+# Shared library extension is .dylib.
+# Bundle extension is .bundle.
 ld='cc';
 so='dylib';
 dlext='bundle';
-dlsrc='dl_rhapsody.xs';
+dlsrc='dl_dyld.xs';
+usedl='define';
 cccdlflags='';
 lddlflags="${ldflags} -bundle -undefined suppress";
+ldlibpthname='DYLD_LIBRARY_PATH';
 useshrplib='true';
-libperl='Perl';
-framework_path='/System/Library/Frameworks/Perl.framework';
-base_address='0x4be00000';
-
-# 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';
-
-# Where to put modules.
-privlib='/System/Library/Perl';
-sitelib='/Local/Library/Perl';
 
+##
+# System libraries
+##
+  
 # vfork works
 usevfork='true';
 
 # malloc works
 usemymalloc='n';
 
-case "$ldlibpthname" in
-'') ldlibpthname=DYLD_LIBRARY_PATH ;;
-esac
-
+# 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;