--- Makefile.orig	Fri Nov 26 15:43:33 1999
+++ Makefile	Mon Nov 29 14:30:32 1999
@@ -118,7 +118,7 @@
 # You may need to change this if the IJG library version changes.
 # See jpeg.mak for more information.
 
-JSRCDIR=jpeg
+JSRCDIR=../jpeg-6b
 JVERSION=6
 
 # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
@@ -136,7 +136,7 @@
 # You may need to change this if the libpng version changes.
 # See libpng.mak for more information.
 
-PSRCDIR=libpng
+PSRCDIR=../libpng-1.0.3
 PVERSION=96
 
 # Choose whether to use a shared version of the PNG library, and if so,
@@ -149,7 +149,7 @@
 # Define the directory where the zlib sources are stored.
 # See zlib.mak for more information.
 
-ZSRCDIR=zlib
+ZSRCDIR=../zlib-1.1.3
 
 # Choose whether to use a shared version of the zlib library, and if so,
 # what its name is (usually libz, but sometimes libgz).
@@ -218,7 +218,8 @@
 # XLDFLAGS can be set from the command line.
 XLDFLAGS=
 
-LDFLAGS=$(XLDFLAGS) -fno-common
+## LDFLAGS=$(XLDFLAGS) -fno-common -Xlinker -rpath -Xlinker /usr/X11R6/lib
+LDFLAGS=-fno-common -Xlinker -rpath -Xlinker /usr/X11R6/lib $(XLDFLAGS) 
 
 # Define any extra libraries to link into the executable.
 # ISC Unix 2.2 wants -linet.
@@ -236,7 +237,7 @@
 # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
 # not in $(XINCLUDE).
 
-XINCLUDE=-I/usr/local/X/include
+XINCLUDE=-I/usr/X11R6/include
 
 # Define the directory/ies and library names for the X11 library files.
 # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
@@ -251,17 +252,16 @@
 #XLIBS=Xt SM ICE Xext X11
 
 #XLIBDIRS=-L/usr/local/X/lib
-XLIBDIRS=-L/usr/X11/lib
+XLIBDIRS=-L/usr/X11R6/lib
 XLIBDIR=
-XLIBS=Xt Xext X11
+XLIBS=Xt Xext X11 SM ICE
 
 # Define the directory/ies for the VFlib files.
 # If you use FreeType, Add ttf to VFLIBS
 #VFINCLUDE=-I/usr/local/include
-#VFLIBDIRS=-L/usr/local/lib
+VFLIBDIRS=-L/usr/local/lib
 #VFLIBS=VFlib
-VFINCLUDE=
-VFLIBDIRS=
+VFINCLUDE=-I/usr/local/include
 VFLIBS=VFlib2 ttf
 
 # Define whether this platform has floating point hardware: