--- Makefile.orig	Thu Aug 29 15:52:37 2002
+++ Makefile	Sun Sep 29 17:50:42 2002
@@ -1,8 +1,8 @@
 # Copyright (C) 1990-2002 Bard Ermentrout
 # Edited for Debian GNU/Linux.
-DESTDIR =
-BINDIR = $(DESTDIR)/usr/X11R6/bin
-DOCDIR = $(DESTDIR)/usr/share/doc/xppaut
+XPPDESTDIR=${PREFIX}
+XPPBINDIR = ${XPPDESTDIR}/bin
+XPPDOCDIR = ${XPPDESTDIR}/doc/xppaut
 # End Debian Edit
 #################################
 #
@@ -22,7 +22,7 @@ OTHERLIBS= libcvode.a libf2cm.a 
 ##################################
 CFLAGS=   -g -O -DAUTO -DCVODE_YES -DHAVEDLL -DMYSTR=$(VERSION)  -I/usr/X11R6/include
 LDFLAGS=  -L/usr/X11R6/lib
-LIBS= -lX11 -lm -ldl 
+LIBS= -lX11 -lm 
 #
 #################################
 # MACOSX                        #
@@ -173,16 +173,15 @@ mkmkavi:
 # Edited for Debian GNU/Linux.
 install: xppaut
 # Make necessary installation directories
-	mkdir -p $(BINDIR)
-	mkdir -p $(DOCDIR)/html
-	mkdir -p $(DOCDIR)/examples
-	mkdir -p $(DESTDIR)/usr/X11R6/man/man1
+	mkdir -p ${XPPBINDIR}
+	mkdir -p ${XPPDOCDIR}/html
+	mkdir -p ${XPPDOCDIR}/examples
+	mkdir -p ${XPPDESTDIR}/man/man1
 # Put everything home
-	cp xppaut $(BINDIR)
-	cp -r ode* $(DOCDIR)/examples
-	cp -r help/* $(DOCDIR)/html
-	cp README *.tex $(DOCDIR) #not so sure about this
-	cp debian/xppaut.1 $(DESTDIR)/usr/X11R6/man/man1
+	cp xppaut ${XPPBINDIR}
+	cp -r ode* ${XPPDOCDIR}/examples
+	cp -r help/* ${XPPDOCDIR}/html
+	cp README *.tex ${XPPDOCDIR} #not so sure about this
 # End Debian Ed
 ##################################################
 #    Make s stand alone library -must link your rhs
