--- hdf/util/Makefile.in.orig	Thu Nov 14 04:12:28 1996
+++ hdf/util/Makefile.in	Sat Oct  3 22:46:36 1998
@@ -121,8 +121,8 @@
 HDFBIN=$(srcdir)/../bin
 
 # ==> where is your JPEG library (libjpeg.a) located?
-JPEGLIB=$(srcdir)/../jpeg
-JPEGINC=$(srcdir)/../jpeg
+JPEGLIB?=$(srcdir)/../jpeg
+JPEGINC?=$(srcdir)/../jpeg
 
 # ==> where is your PABLO include files
 PABLO_HINC= $(srcdir)/../pablo
@@ -132,8 +132,8 @@
 FMPOOL_SRC=$(srcdir)/../fmpool
 
 # ==> where is your zlib library (libz.a) located?
-ZLIBLIB=$(srcdir)/../zlib
-ZLIBINC=$(srcdir)/../zlib
+ZLIBLIB?=$(srcdir)/../zlib
+ZLIBINC?=$(srcdir)/../zlib
 
 #Where are the utility includes
 UTILINC=$(srcdir)
@@ -216,13 +216,13 @@
 	$(CC) $(ALL_CFLAGS) -c $<
 
 .c: $(HDFLIB)/libdf.a
-	$(CC) $(ALL_CFLAGS) $< -o $@ $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a $(LIBSX)
+	$(CC) $(ALL_CFLAGS) $< -o $@ $(HDFLIB)/libdf.a $(JPEGLIB)/libjpeg.a $(ZLIBLIB) $(LIBSX)
 
 .f: $(HDFLIB)/libdf.a 
-	$(FC) $(FFLAGS) $< $(HDFLIB)/libdf.a -o $@ $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a
+	$(FC) $(FFLAGS) $< $(HDFLIB)/libdf.a -o $@ $(JPEGLIB)/libjpeg.a $(ZLIBLIB)
 
 hdfed: he.h he_proto.h $(HEOBJ) $(HDFLIB)/libdf.a $(FRC)
-	$(CC) $(ALL_CFLAGS) $(HEOBJ) $(HDFLIB)/libdf.a -o hdfed $(JPEGLIB)/libjpeg.a $(ZLIBLIB)/libz.a
+	$(CC) $(ALL_CFLAGS) $(HEOBJ) $(HDFLIB)/libdf.a -o hdfed $(JPEGLIB)/libjpeg.a $(ZLIBLIB)
 
 utils: $(UTILS) $(HDFLIB)/libdf.a $(FRC)
 
