diff -Naur cmucl.orig/LICENSE cmucl/LICENSE
--- cmucl.orig/LICENSE	1969-12-31 16:00:00.000000000 -0800
+++ cmucl/LICENSE	2005-04-10 20:45:17.000000000 -0700
@@ -0,0 +1,53 @@
+;;; **********************************************************************
+;;; This code was written as part of the CMU Common Lisp project at
+;;; Carnegie Mellon University, and has been placed in the public domain.
+;;;
+;;;
+;;; **********************************************************************
+
+
+PCL:
+
+;;; *************************************************************************
+;;; Copyright (c) 1985, 1986, 1987, 1988, 1989, 1990 Xerox Corporation.
+;;; All rights reserved.
+;;;
+;;; Use and copying of this software and preparation of derivative works
+;;; based upon this software are permitted.  Any distribution of this
+;;; software or derivative works must comply with all applicable United
+;;; States export control laws.
+;;; 
+;;; This software is made available AS IS, and Xerox Corporation makes no
+;;; warranty about the software, its performance or its conformity to any
+;;; specification.
+;;; 
+;;; Any person obtaining a copy of this software is requested to send their
+;;; name and post office or electronic mail address to:
+;;;   CommonLoops Coordinator
+;;;   Xerox PARC
+;;;   3333 Coyote Hill Rd.
+;;;   Palo Alto, CA 94304
+;;; (or send Arpanet mail to CommonLoops-Coordinator.pa@Xerox.arpa)
+;;;
+;;; Suggestions, comments and requests for improvements are also welcome.
+;;; *************************************************************************
+
+
+CLX:
+
+;;;
+;;;                      TEXAS INSTRUMENTS INCORPORATED
+;;;                               P.O. BOX 2909
+;;;                            AUSTIN, TEXAS 78769
+;;;
+;;; Copyright (C) 1987 Texas Instruments Incorporated.
+;;;
+;;; Permission is granted to any individual or institution to use, copy, modify,
+;;; and distribute this software, provided that this complete copyright and
+;;; permission notice is maintained, intact, in all copies and supporting
+;;; documentation.
+;;;
+;;; Texas Instruments Incorporated provides this software "as is" without
+;;; express or implied warranty.
+;;;
+
diff -Naur cmucl.orig/src/lisp/Config.ppc_darwin cmucl/src/lisp/Config.ppc_darwin
--- cmucl.orig/src/lisp/Config.ppc_darwin	2005-02-06 11:43:15.000000000 -0800
+++ cmucl/src/lisp/Config.ppc_darwin	2005-04-10 21:04:14.000000000 -0700
@@ -3,7 +3,7 @@
 vpath %.c $(PATH1)
 vpath %.S $(PATH1)
 CPPFLAGS = -I. -I$(PATH1) -I/usr/X11R6/include
-CC = gcc3
+CC = gcc
 LD = ld
 NM = $(PATH1)/darwin-nm
 CPP = cpp -no-cpp-precomp
diff -Naur cmucl.orig/src/motif/server/Config.Darwin cmucl/src/motif/server/Config.Darwin
--- cmucl.orig/src/motif/server/Config.Darwin	2004-07-25 13:25:41.000000000 -0700
+++ cmucl/src/motif/server/Config.Darwin	2005-04-10 20:45:58.000000000 -0700
@@ -1,5 +1,5 @@
-CFLAGS = -O2 -I/sw/include -I/usr/local/include -I/usr/X11R6/include -I. -I$(VPATH)
-LDFLAGS = -L/usr/X11R6/lib -L/sw/lib -L/usr/local/lib
+CFLAGS = -O2 -I@PREFIX@/include -I/usr/X11R6/include -I. -I$(VPATH)
+LDFLAGS = -L/usr/X11R6/lib -L@PREFIX@/lib
 LIBS = -lXm -lXt -lXext -lX11 -lSM -lICE
 #LIBS = -lXm -lXt -lXext -lX11 -lSM -lICE -llanginfo
 # This def assumes you are building in the same or parallel
diff -Naur cmucl.orig/src/tools/make-extra-dist.sh cmucl/src/tools/make-extra-dist.sh
--- cmucl.orig/src/tools/make-extra-dist.sh	2003-10-25 09:04:31.000000000 -0700
+++ cmucl/src/tools/make-extra-dist.sh	2005-04-10 20:45:35.000000000 -0700
@@ -49,8 +49,8 @@
 	PATH=/usr/ucb:$PATH
 fi
 
-echo Cleaning $DESTDIR
-[ -d $DESTDIR ] && rm -rf $DESTDIR
+#echo Cleaning $DESTDIR
+#[ -d $DESTDIR ] && rm -rf $DESTDIR
 
 echo Installing extra components
 install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib
@@ -72,19 +72,19 @@
 install ${GROUP} ${OWNER} -m 0755 $TARGET/motif/server/motifd \
 	$DESTDIR/lib/cmucl/lib/
 
-sync ; sleep 1 ; sync ; sleep 1 ; sync
-echo Tarring extra components
-if [ -n "$ENABLE_GZIP" ]; then
-    echo "  Compressing with gzip"
-    ( cd $DESTDIR ; tar cf - lib ) | \
-	gzip -c > cmucl-$VERSION-$ARCH-$OS.extra.tar.gz
-fi
-if [ -n "$ENABLE_BZIP" ]; then
-    echo "  Compressing with bzip"
-    ( cd $DESTDIR ; tar cf - lib ) | \
-	bzip2 > cmucl-$VERSION-$ARCH-$OS.extra.tar.bz2
-fi
+#sync ; sleep 1 ; sync ; sleep 1 ; sync
+#echo Tarring extra components
+#if [ -n "$ENABLE_GZIP" ]; then
+#    echo "  Compressing with gzip"
+#    ( cd $DESTDIR ; tar cf - lib ) | \
+#	gzip -c > cmucl-$VERSION-$ARCH-$OS.extra.tar.gz
+#fi
+#if [ -n "$ENABLE_BZIP" ]; then
+#    echo "  Compressing with bzip"
+#    ( cd $DESTDIR ; tar cf - lib ) | \
+#	bzip2 > cmucl-$VERSION-$ARCH-$OS.extra.tar.bz2
+#fi
 
-echo Cleaning $DESTDIR
-[ -d $DESTDIR ] && rm -rf $DESTDIR
+#echo Cleaning $DESTDIR
+#[ -d $DESTDIR ] && rm -rf $DESTDIR
 echo Done
diff -Naur cmucl.orig/src/tools/make-main-dist.sh cmucl/src/tools/make-main-dist.sh
--- cmucl.orig/src/tools/make-main-dist.sh	2003-10-18 08:45:57.000000000 -0700
+++ cmucl/src/tools/make-main-dist.sh	2005-04-10 20:45:35.000000000 -0700
@@ -49,8 +49,8 @@
 	PATH=/usr/ucb:$PATH
 fi
 
-echo Cleaning $DESTDIR
-[ -d $DESTDIR ] && rm -rf $DESTDIR
+#echo Cleaning $DESTDIR
+#[ -d $DESTDIR ] && rm -rf $DESTDIR
 
 echo Installing main components
 install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/bin
@@ -81,25 +81,25 @@
 install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \
 	$DESTDIR/man/man1/
 install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/doc/cmucl/
-if [ -f src/general-info/release-$VERSION.txt ] 
+if [ -f "src/general-info/release-$VERSION.txt" ] 
 then
 	install ${GROUP} ${OWNER} -m 0644 src/general-info/release-$VERSION.txt \
 		$DESTDIR/doc/cmucl/
 fi
 
-sync ; sleep 1 ; sync ; sleep 1 ; sync
-echo Tarring main components
-if [ -n "$ENABLE_GZIP" ]; then
-    echo "  Compressing with gzip"
-    ( cd $DESTDIR ; tar cf - bin doc lib man ) | \
-	gzip -c > cmucl-$VERSION-$ARCH-$OS.tar.gz
-fi
-if [ -n "$ENABLE_BZIP" ]; then
-    echo "  Compressing with bzip"
-    ( cd $DESTDIR ; tar cf - bin doc lib man ) | \
-	bzip2 > cmucl-$VERSION-$ARCH-$OS.tar.bz2
-fi
-
-echo Cleaning $DESTDIR
-[ -d $DESTDIR ] && rm -rf $DESTDIR
+#sync ; sleep 1 ; sync ; sleep 1 ; sync
+#echo Tarring main components
+#if [ -n "$ENABLE_GZIP" ]; then
+#    echo "  Compressing with gzip"
+#    ( cd $DESTDIR ; tar cf - bin doc lib man ) | \
+#	gzip -c > cmucl-$VERSION-$ARCH-$OS.tar.gz
+#fi
+#if [ -n "$ENABLE_BZIP" ]; then
+#    echo "  Compressing with bzip"
+#    ( cd $DESTDIR ; tar cf - bin doc lib man ) | \
+#	bzip2 > cmucl-$VERSION-$ARCH-$OS.tar.bz2
+#fi
+#
+#echo Cleaning $DESTDIR
+#[ -d $DESTDIR ] && rm -rf $DESTDIR
 echo Done