--- Makefile.orig	Fri Sep  3 22:01:59 1999
+++ Makefile	Sun Jul 15 04:45:41 2007
@@ -2,10 +2,10 @@
 # your site:
 #
 # where dvi2dvi is installed
-BINAREA=/usr/local/bin
+BINAREA=${PREFIX}/bin
 #
 # directory for dvi2dvi: where the auxiliary files are installed
-DVI2LIB=/usr/local/lib/dvi2dvi
+DVI2LIB=${PREFIX}/lib/dvi2dvi
 #
 # name of default fontdesc file in your site
 FONTDESC=fontdesc
@@ -13,16 +13,16 @@
 DVI2PATH=.:${DVI2LIB}
 
 # kpathsea
-KPSEINCLUDE = -I/usr/local/include -DKPATHSEA
-KPSELIB = -L/usr/local/lib -lkpathsea
+KPSEINCLUDE = -I${kpathsea_parent} -DKPATHSEA
+KPSELIB = -L${kpathsea_parent}/kpathsea/STATIC -lkpathsea
 
 #
-CC=gcc
+CC?=gcc
 #
-CCFLAGS = -g
+#CCFLAGS = -g
 #CCFLAGS = -O		# SUN etc ...
 #CCFLAGS = -O -traditional -DPOSIX	# 386bsd (gcc 1.X)
-#CCFLAGS = -O -DPOSIX	# Netbsd (gcc 2.X), Linux
+CCFLAGS += -O -DPOSIX -DANSI	# Netbsd (gcc 2.X), Linux
 #CCFLAGS = -O -bsd	# NeXT
 #CCFLAGS = -O -DMSDOS -DPOSIX	# DJGCC (gcc 2.X)
 #CCFLAGS = -O -DSYSV	# SysV
@@ -74,7 +74,7 @@
 
 newlib:
 	-mkdir lib
-	cp -pr lib-dist/* lib
+	cp -r lib-dist/* lib
 
 install: install-dvi2dvi
 
@@ -83,7 +83,7 @@
 
 install-lib:
 	-mkdir ${DVI2LIB}
-	cp -pr lib/* ${DVI2LIB}
+	cp -r lib/* ${DVI2LIB}
 	chmod -R a+r ${DVI2LIB}
 
 clean: