--- old/Configure	Tue Jan 14 14:15:01 2003
+++ new/Configure	Tue Jan 14 14:16:14 2003
@@ -3614,6 +3614,18 @@
 test "X$gfpthkeep" != Xy && gfpth=""
 EOSC
 
+# gcc 3.1 complains about adding -Idirectories that it already knows about,
+# so we will take those off from locincpth.
+case "$gccversion" in
+3*)
+    echo "main(){}">try.c
+    for incdir in `$cc -v -c try.c 2>&1 | \
+       sed '1,/^#include <\.\.\.>/d;/^End of search list/,$d;s/^ //'` ; do
+       locincpth=`echo $locincpth | sed s!$incdir!!`
+    done
+    $rm -f try try.*
+esac
+
 : What should the include directory be ?
 echo " "
 $echo $n "Hmm...  $c"
--- old/makedepend.SH	Mon Mar 19 01:33:17 2001
+++ new/makedepend.SH	Tue Jan 14 14:21:51 2003
@@ -155,6 +155,9 @@
         $sed \
 	    -e '1d' \
 	    -e '/^#.*<stdin>/d' \
+	    -e '/^#.*<builtin>/d' \
+	    -e '/^#.*<built-in>/d' \
+	    -e '/^#.*<command line>/d' \
 	    -e '/^#.*"-"/d' \
 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
 	    -e 's/^[	 ]*#[	 ]*line/#/' \
--- old/hints/darwin.sh	Tue Jan 14 17:05:47 2003
+++ new/hints/darwin.sh	Tue Jan 14 18:00:39 2003
@@ -8,18 +8,18 @@
 ##
 
 # BSD paths
-prefix='/usr';
-siteprefix='/usr/local';
-vendorprefix='/usr/local'; usevendorprefix='define';
+# prefix='/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';
+# man1dir='/usr/share/man/man1';
+# man3dir='/usr/share/man/man3';
 
 # Where to put modules.
-privlib='/System/Library/Perl';
-sitelib='/Local/Library/Perl';
+# privlib='/System/Library/Perl';
+sitelib='/Library/Perl';
 vendorlib='/Network/Library/Perl';
 
 ##