--- Makefile.unx.orig	Fri Nov 10 02:32:50 2000
+++ Makefile.unx	Wed Nov 22 21:46:33 2000
@@ -2,9 +2,9 @@
 # Copyright (C) 1996 Willem van Schaik
 
 #CC=cc
-CC=gcc
-OPTIMFLAGS = -O3 
-DEBUGFLAGS = -g -Wall -W
+#CC=gcc
+#OPTIMFLAGS = -O3 
+#DEBUGFLAGS = -g -Wall -W
 #COPY=cp
 COPY=/bin/cp -p
 DEL=/bin/rm -f
@@ -56,15 +56,9 @@
 INSTALL=/usr/local
 
 # GRR 19990713:  FAXPECT is a custom conversion option for stretched faxes
-CFLAGS=$(TIFF_VERSION) -DFAXPECT $(MIN_INVERT) $(OPTIMFLAGS) $(DEBUGFLAGS) \
-	-I$(TIFFINC) \
-	-I$(PNGINC) \
-	-I$(ZINC)
-LDFLAGS=-L. \
-	-L$(LIBTIFF)/ \
-	-L$(LIBPNG)/ \
-	-L$(ZLIB)/ \
-	-lpng -lz -ltiff -ljpeg -lm
+CFLAGS+=$(TIFF_VERSION) -DFAXPECT $(MIN_INVERT) $(OPTIMFLAGS) $(DEBUGFLAGS) \
+	-I${LOCALBASE}/include
+LDFLAGS=-L. -L${LOCALBASE}/lib -lpng -lz -ltiff -ljpeg -lm
 SLDFLAGS=-L. \
 	$(LIBTIFF)/libtiff.a $(LIBJPEG)/libjpeg.a \
 	$(LIBPNG)/libpng.a \
