diff --git a/.Sanitize b/.Sanitize
index cec8a8918c..c304e527d4 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -367,33 +367,6 @@ else
 	done
 fi
 
-if ( echo $* | grep keep\-gm > /dev/null ) ; then
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Keeping gm stuff in $i
-			fi
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-gm $i > /dev/null) ; then
-			if [ -n "${verbose}" ] ; then
-				echo Removing traces of \"gm\" from $i...
-			fi
-			cp $i new
-			sed '/start\-sanitize\-gm/,/end-\sanitize\-gm/d' < $i > new
-			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-				if [ -n "${verbose}" ] ; then
-					echo Caching $i in .Recover...
-				fi
-				mv $i .Recover
-			fi
-			mv new $i
-		fi
-	done
-fi
-
 if ( echo $* | grep keep\-ide > /dev/null ) ; then
 	for i in * ; do
 		if test ! -d $i && (grep sanitize-ide $i > /dev/null) ; then
diff --git a/ChangeLog b/ChangeLog
index 921ecf0b44..0e4af5e8df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Wed Oct  1 13:11:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* configure: Handle autoconf style directory options: --bindir,
+	--datadir, --includedir, --infodir, --libdir, --libexecdir,
+	--mandir, --oldincludedir, --sbindir, --sharedstatedir,
+	--sysconfdir.
+	* Makefile.in (sbindir, libexecdir, sysconfdir): New variables.
+	(sharedstatedir, localstatedir, oldincludedir): New variables.
+	(BASE_FLAGS_TO_PASS): Pass down bindir, datadir, includedir,
+	infodir, libdir, libexecdir, localstatedir, mandir, oldincludedir,
+	sbindir, sharedstatedir, and sysconfdir.
+
+start-sanitize-d30v	
+Wed Sep 24 18:06:27 1997  Stu Grossman  <grossman@babylon-5.cygnus.com>
+
+	* configure.in (d30v):  Remove tcl, tk, expect, gdb, itcl, tix, db,
+ 	sn, and gnuserv from noconfigdirs.
+
+end-sanitize-d30v	
 Wed Sep 24 15:18:32 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* ltmain.sh: Tweak shell pattern to avoid bug in NetBSD /bin/sh.
@@ -1898,12 +1917,6 @@ Fri Oct 27 09:32:30 1995  Stu Grossman  (grossman@cygnus.com)
 	null) if toplevel/config/mh-{host} doesn't define it.  Fixes a
 	problem with autoconf trying to configure on a host without GCC.
 
-start-sanitize-gm
-Fri Oct 27 09:32:25 1995  Stu Grossman  (grossman@cygnus.com)
-
-	* config.sub:  Add `magic' as an OS target for General Magic.
-
-end-sanitize-gm
 Thu Oct 26 22:35:01 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-configure: Set host alias from choice of host compiler,