--- ../../clisp/build-sparc-gcc-3.3/Makefile	2008-09-23 20:29:49.000000000 -0400
+++ Makefile	2008-10-13 21:58:33.000000000 -0400
@@ -6,8 +6,8 @@
 # -------------- Start of configurable section --------------------
 
 # The official version number
-PACKAGE_VERSION=2.46+ (2008-07-08)
-VERSION=2.46+
+PACKAGE_VERSION=2.46++ (2008-09-23)
+VERSION=2.46++
 # The official package name
 PACKAGE_NAME=GNU CLISP
 # If you want to distribute a modified version of CLISP,
@@ -56,7 +56,7 @@
 
 # Programs used by "make":
 CC = gcc
-CPPFLAGS = -I/export/apps/solaris2.8/include  -Igllib
+CPPFLAGS = -I/export/apps/solaris2.8/include 
 CFLAGS = -g -O2 -W -Wswitch -Wcomment -Wpointer-arith -Wimplicit -Wreturn-type -Wmissing-declarations -Wno-sign-compare -O2 -fno-schedule-insns -fno-gcse -falign-functions=4 -DUNIX_BINARY_DISTRIB -DUNICODE -I.
 CPP = gcc -E
 CLFLAGS =   -x none
@@ -624,9 +624,6 @@
 gllib/uniwidth/width.o gllib/uniname/uniname.o gllib/localcharset.o : gllib
 	cd gllib && $(MAKE) CFLAGS="$(SUBDIR_CFLAGS)"
 
-../src/configure : ../src/configure.in
-	cd ../ && $(MAKE) -f Makefile.devel src/configure
-
 makemake : makemake.in config.status
 	sh config.status --file=makemake
 
@@ -688,19 +685,19 @@
 
 UTILCC=$(CC)
 comment5 : ../utils/comment5.c
-	$(UTILCC) $(CPPFLAGS) $(CFLAGS) $(CLFLAGS)  ../utils/comment5.c -o comment5
+	$(UTILCC) $(XCPPFLAGS) $(XCFLAGS) $(XCLFLAGS) ../utils/comment5.c -o comment5
 
 gctrigger : ../utils/gctrigger.c
-	$(UTILCC) $(CPPFLAGS) $(CFLAGS) $(CLFLAGS)  ../utils/gctrigger.c -o gctrigger
+	$(UTILCC) $(XCPPFLAGS) $(XCFLAGS) $(XCLFLAGS) ../utils/gctrigger.c -o gctrigger
 
 varbrace : ../utils/varbrace.c
-	$(UTILCC) $(CPPFLAGS) $(CFLAGS) $(CLFLAGS)  ../utils/varbrace.c -o varbrace
+	$(UTILCC) $(XCPPFLAGS) $(XCFLAGS) $(XCLFLAGS) ../utils/varbrace.c -o varbrace
 
 txt2c : ../utils/txt2c.c
-	$(UTILCC) $(CPPFLAGS) $(CFLAGS) $(CLFLAGS)  ../utils/txt2c.c -o txt2c
+	$(UTILCC) $(XCPPFLAGS) $(XCFLAGS) $(XCLFLAGS) ../utils/txt2c.c -o txt2c
 
 ccmp2c : ../utils/ccmp2c.c
-	$(UTILCC) $(CPPFLAGS) $(CFLAGS) $(CLFLAGS)  ../utils/ccmp2c.c -o ccmp2c
+	$(UTILCC) $(XCPPFLAGS) $(XCFLAGS) $(XCLFLAGS) ../utils/ccmp2c.c -o ccmp2c
 
 
 uni_upcase.c : ../src/uni_upcase.c
@@ -2454,24 +2451,24 @@
 	$(RM) fresh-line.out
 
 check-script : lisp.run lispinit.mem
-	test `echo '(princ (+ 11 99))' | $(RUN) -q -M lispinit.mem -` = 110 || exit 1
-	test "`echo '(+ foo bar)' | $(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl | tr '\n' '_' | tr -d '\r'`" = '99_[1]> _110_' || exit 1
+	test `echo '(princ (+ 11 99))' | $(RUN) -q -M lispinit.mem - | tr -d '\r'` = 110 || exit 1
+	test "`echo '(+ foo bar)' | $(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl | tr -d '\r'| tr '\n' '_'`" = '99_[1]> _110_' || exit 1
 	echo '(progn (setf (stream-element-type *standard-input*) (quote (unsigned-byte 8))) (exit 42))' | $(RUN) -q -M lispinit.mem -; test $$? = 42 || exit 1
-	test `echo '(setf (stream-element-type *standard-output*) (quote (unsigned-byte 8))) (write-sequence (convert-string-to-bytes "42" charset:ascii) *standard-output*) (setf (stream-element-type *standard-output*) (quote character)) (terpri)' | $(RUN) -q -M lispinit.mem - | cat` = 42 || exit 1
+	test `echo '(setf (stream-element-type *standard-output*) (quote (unsigned-byte 8))) (write-sequence (convert-string-to-bytes "42" charset:ascii) *standard-output*) (setf (stream-element-type *standard-output*) (quote character)) (terpri)' | $(RUN) -q -M lispinit.mem - | tr -d '\r'` = 42 || exit 1
 	$(RM) script.lisp; echo '(+ 11 99)' > script.lisp
-	test `$(RUN) -q -M lispinit.mem < script.lisp` = 110 || exit 1
+	test `$(RUN) -q -M lispinit.mem < script.lisp | tr -d '\r'` = 110 || exit 1
 	$(RM) script.lisp; echo '(princ (+ 11 99))' > script.lisp
-	test `$(RUN) -q -M lispinit.mem script.lisp` = 110 || exit 1
+	test `$(RUN) -q -M lispinit.mem script.lisp | tr -d '\r'` = 110 || exit 1
 	$(RM) script.lisp; echo '(+ foo bar)' > script.lisp
-	test `$(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl < script.lisp | tr '\n' '_' | tr -d '\r'` = 99_110_ || exit 1
+	test `$(RUN) -q -M lispinit.mem -x '(setq foo 11 bar 99)' -repl < script.lisp | tr -d '\r'| tr '\n' '_'` = 99_110_ || exit 1
 	$(RM) script.lisp; echo '(progn (setf (stream-element-type *standard-input*) (quote (unsigned-byte 8))) (exit 42))' > script.lisp
 	$(RUN) -q -M lispinit.mem < script.lisp; test $$? = 42 || exit 1
 	$(RUN) -q -M lispinit.mem script.lisp; test $$? = 42 || exit 1
 	$(RM) script.lisp; echo '(setf (stream-element-type *standard-output*) (quote (unsigned-byte 8))) (write-sequence (convert-string-to-bytes "42" charset:ascii) *standard-output*) (setf (stream-element-type *standard-output*) (quote character)) (terpri)' > script.lisp
-	test `$(RUN) -q -M lispinit.mem script.lisp | cat` = 42 || exit 1
+	test `$(RUN) -q -M lispinit.mem script.lisp | tr -d '\r'` = 42 || exit 1
 	$(RM) script.lisp; echo '(with-open-stream (s (make-stream :output :element-type (quote (unsigned-byte 8)))) (write-sequence (convert-string-to-bytes "42" charset:ascii) s) (values))' > script.lisp
-	test `$(RUN) -q -M lispinit.mem < script.lisp` = 42 || exit 1
-	test `$(RUN) -q -M lispinit.mem script.lisp` = 42 || exit 1
+	test `$(RUN) -q -M lispinit.mem < script.lisp | tr -d '\r'` = 42 || exit 1
+	test `$(RUN) -q -M lispinit.mem script.lisp | tr -d '\r'` = 42 || exit 1
 	$(RM) script.lisp
 
 check-exec-image: lisp.run lispinit.mem