diff -U 3 -dHrN -- xpp-orig/Makefile xpp-neu/Makefile
--- xpp-orig/Makefile	2003-07-17 17:32:21.000000000 +0200
+++ xpp-neu/Makefile	2004-05-06 13:47:54.526279992 +0200
@@ -1,8 +1,9 @@
 # Copyright (C) 1990-2002 Bard Ermentrout
 # Edited for Debian GNU/Linux.
-DESTDIR =
-BINDIR = $(DESTDIR)/usr/X11R6/bin
-DOCDIR = $(DESTDIR)/usr/share/doc/xppaut
+#DESTDIR = @destdir@
+#BINDIR = $(DESTDIR)/usr/X11R6/bin
+#DOCDIR = $(DESTDIR)/usr/share/doc/xppaut
+
 # End Debian Edit
 #################################
 #
@@ -20,7 +21,7 @@
 ################################## 
 # Standard Linux distributions   #
 ##################################
-CFLAGS=   -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION)  -I/usr/X11R6/include
+MY_CFLAGS=  -DAUTO -DCVODE_YES -DNOERRNO -DHAVEDLL -DMYSTR=$(VERSION) -I/usr/X11R6/include
 LDFLAGS=  -L/usr/X11R6/lib
 LIBS= -lX11 -lm -ldl 
 # NOTE: Recent (RedHat 8) versions of GCC seem to no longer have
@@ -142,6 +143,11 @@
         menudrive.o userbut.o 
 AUTOOBJ = autlib1.o autlib2.o autlib3.o autevd.o run_auto.o autpp.o \
 	diagram.o auto_nox.o auto_x11.o flowkm_small.o 
+
+
+.c.o:
+	$(CC) $(CFLAGS) $(MY_CFLAGS) -c $*.c
+
 ######################################################################
 #
 #
@@ -176,19 +182,19 @@
 	cd mkavi ; make
 #
 # Edited for Debian GNU/Linux.
-install: xppaut 
+install: xppaut xppdoc
 # Make necessary installation directories
 	mkdir -p $(BINDIR)
 	mkdir -p $(DOCDIR)/html
 	mkdir -p $(DOCDIR)/examples
-	mkdir -p $(DESTDIR)/usr/X11R6/man/man1
+	mkdir -p $(MANDIR)/man1
 # Put everything home
 	strip xppaut
 	cp xppaut $(BINDIR)
 	cp -r ode* $(DOCDIR)/examples
 	cp -r help/* $(DOCDIR)/html
 	cp README *.pdf $(DOCDIR) 
-	cp xppaut.1 $(DESTDIR)/usr/X11R6/man/man1
+	cp xppaut.1 $(MANDIR)/man1
 # End Debian Ed
 uninstall: 
 # Remove everything you created
@@ -222,7 +228,12 @@
 #  clean
 ##############################################
 clean:
-	rm *.o;rm libI77/*.o;rm cvodesrc/*.o
+	rm -f *.o;rm -f libI77/*.o;rm -f cvodesrc/*.o
+	rm -f *.a;rm -f libI77/*.a;rm -f cvodesrc/*.a
+	find . -name \*.ps | xargs rm
+	find . -name \*.pdf | xargs rm
+	find . -name \*.dvi | xargs rm
+	find . -name \*~ | xargs rm
 #######################################################
 #  Documentation
 #######################################################
@@ -235,5 +246,5 @@
 	 latex xpp_sum
 	 latex xpp_sum
 	 dvips -o xpp_sum.ps  xpp_sum
-	  ps2pdf xpp_sum.ps
+	 ps2pdf xpp_sum.ps
 
diff -U 3 -dHrN -- xpp-orig/cvodesrc/Makefile xpp-neu/cvodesrc/Makefile
--- xpp-orig/cvodesrc/Makefile	1999-09-07 18:18:22.000000000 +0200
+++ xpp-neu/cvodesrc/Makefile	2004-05-06 13:48:09.847950744 +0200
@@ -6,7 +6,7 @@
 # to ranlib from the commands to create lib/libcvode.a.
 .SUFFIXES: .c .o
 CC = gcc
-CFLAGS = -O
+MY_CFLAGS = -fPIC -DPIC
 
 SRCS = cvode.c  cvdense.c  dense.c  cvband.c \
         band.c  cvdiag.c  cvspgmr.c  spgmr.c  \
@@ -17,7 +17,7 @@
 
 
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) $(MY_CFLAGS) -c $*.c
 
 lib libcvode.a: $(OBJS)
 	        (ar rcv libcvode.a $(OBJS); ranlib libcvode.a ; cp libcvode.a ../.)
diff -U 3 -dHrN -- xpp-orig/libI77/Makefile xpp-neu/libI77/Makefile
--- xpp-orig/libI77/Makefile	2003-06-23 18:01:33.000000000 +0200
+++ xpp-neu/libI77/Makefile	2004-05-06 13:48:00.810324672 +0200
@@ -8,7 +8,7 @@
 #  wsfe.c:42: structure has no member named `_ptr'
 #   ...
 #  Then try the following:
-CFLAGS = -DSkip_f2c_Undefs -DNON_UNIX_STDIO -O
+MY_CFLAGS = -fPIC -DPIC -DSkip_f2c_Undefs -DNON_UNIX_STDIO
 #
 # I really don't know what the $!@@**! is going on but it works ...
 #
@@ -18,7 +18,7 @@
 # this seems to work fine and is much less subject to
 # screwups
 .c.o:
-	$(CC) $(CFLAGS) -c $*.c
+	$(CC) $(CFLAGS) $(MY_CFLAGS) -c $*.c
 #
 # 
 # compile, then strip unnecessary symbols