--- Makefile.config.orig	Sat Mar 25 02:39:40 2000
+++ Makefile.config	Sat Apr  1 12:00:00 2000
@@ -29,12 +29,12 @@
 # The C compiler (including macro preprocessor)
 #CC =		cc
 #CC =		gcc
-CC =		gcc -fpcc-struct-return
+CC ?=		gcc -fpcc-struct-return
 
 # The linker
 #LD = ld
 #LD = cc
-LD = gcc 
+LD = ${CC} 
 
 # Normally the man pages are installed using "cp".  But via this
 # variable, you can use something else, for example a script that
@@ -42,11 +42,11 @@
 # systems which use man pages in the "cat" format.
 
 #MANCP = $(SRCDIR)/mantocat
-MANCP =	cp
+MANCP =	${BSD_INSTALL_MAN}
 
 SHELL =	/bin/sh
-MAKE = make
-INSTALL = install
+MAKE ?= make
+INSTALL ?= install
 AR= ar
 RANLIB=	ranlib
 
@@ -54,7 +54,7 @@
 # C compiler options
 
 #CFLAGS = -O2 -std1 $(CDEBUG)
-CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
+CFLAGS ?= -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
   
 # linker options.  Eunice users may want to use -noshare so that
 # the executables can run standalone.
@@ -81,8 +81,10 @@
 
 #TIFFINC_DIR = /usr/local1/DEC/include
 #TIFFLIB_DIR = /usr/local1/DEC/lib
-TIFFHDR_DIR = $(SRCDIR)/libtiff
-TIFFLIB_DIR = $(SRCDIR)/libtiff
+#TIFFHDR_DIR = $(SRCDIR)/libtiff
+#TIFFLIB_DIR = $(SRCDIR)/libtiff
+TIFFINC_DIR = ${LOCALBASE}/include
+TIFFLIB_DIR = ${LOCALBASE}/lib
 
 # Put the location of your JPEG library here.
 # If you want to build the jpeg converters or tiff
@@ -104,16 +106,16 @@
 #JPEGHDR_DIR = /usr/local1/DEC/include
 #JPEGLIB_DIR = NONE
 #JPEGHDR_DIR = NONE
-JPEGLIB_DIR = /usr/lib/jpeg
-JPEGHDR_DIR = /usr/include/jpeg
+JPEGLIB_DIR = ${LOCALBASE}/lib
+JPEGHDR_DIR = ${LOCALBASE}/include
 
 
 #PNGLIB_DIR = /usr/local1/DEC/lib
 #PNGHDR_DIR = /usr/local1/DEC/include
 #PNGLIB_DIR = NONE
 #PNGHDR_DIR = NONE
-PNGLIB_DIR = /lib
-PNGHDR_DIR = /usr/include/png
+PNGLIB_DIR = ${LOCALBASE}/lib
+PNGHDR_DIR = ${LOCALBASE}/include
 
 
 # The following variables are used only by 'make install' (and the
@@ -124,7 +126,7 @@
 # you're spreading Netpbm across your system, use "/".
 
 #INSTALL_PREFIX = /usr/local1/DEC/packages/netpbm
-INSTALL_PREFIX = /usr/local/netpbm
+INSTALL_PREFIX = ${PREFIX}
 
 # Specify the directory where you want the executables.
 # If you need scripts and binaries to be in different directories, you