--- unix-gcc.mak.orig	Wed May 27 15:38:48 1998
+++ unix-gcc.mak	Wed May 27 16:21:49 1998
@@ -43,16 +43,16 @@
 INSTALL_PROGRAM = $(INSTALL) -m 755
 INSTALL_DATA = $(INSTALL) -m 644
 
-prefix = /usr/local
+prefix = /usr
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 scriptdir = $(bindir)
 mandir = $(prefix)/man
 man1ext = 1
 man1dir = $(mandir)/man$(man1ext)
-datadir = $(prefix)/share
+datadir = $(prefix)/lib
 gsdir = $(datadir)/ghostscript
-gsdatadir = $(gsdir)/4.03
+gsdatadir = $(gsdir)
 
 docdir=$(gsdatadir)/doc
 exdir=$(gsdatadir)/examples
@@ -101,7 +101,7 @@
 # You may need to change this if the libpng version changes.
 # See libpng.mak for more information.
 
-PSRCDIR=libpng
+PSRCDIR=libpng-0.89c
 PVERSION=89
 
 # Choose whether to use a shared version of the PNG library (-lpng).
@@ -112,7 +112,7 @@
 # Define the directory where the zlib sources are stored.
 # See zlib.mak for more information.
 
-ZSRCDIR=zlib
+ZSRCDIR=zlib-1.0.2
 
 # Choose whether to use a shared version of the zlib library (-lgz).
 # See gs.mak and make.txt for more information.
@@ -180,7 +180,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/include/X11
 
 # 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
@@ -220,18 +220,39 @@
 
 # Choose the device(s) to include.  See devs.mak for details.
 
-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11mono.dev
-DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
-DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
-DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
-DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
-DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev
-DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
-DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
-DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
-DEVICE_DEVS12=psmono.dev bit.dev bitrgb.dev bitcmyk.dev
-DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
-DEVICE_DEVS15=pdfwrite.dev
+DEVICE_DEVS= lvga256.dev ap3250.dev appledmp.dev \
+bit.dev bitcmyk.dev bitrgb.dev \
+bj10e.dev bj200.dev bjc600.dev bjc800.dev bmp16.dev bmp16m.dev bmp256.dev \
+bmpmono.dev cdeskjet.dev cdj500.dev cdj550.dev cdjcolor.dev cdjmono.dev \
+cgm24.dev cgm8.dev cgmmono.dev cif.dev cp50.dev declj250.dev deskjet.dev \
+dfaxhigh.dev dfaxlow.dev djet500.dev djet500c.dev dnj650c.dev eps9high.dev \
+eps9mid.dev epson.dev epsonc.dev faxg3.dev faxg32d.dev faxg4.dev ibmpro.dev \
+imagen.dev iwhi.dev iwlo.dev iwlq.dev \
+jetp3852.dev la50.dev la70.dev la75.dev \
+la75plus.dev laserjet.dev lbp8.dev lips3.dev lj250.dev lj4dith.dev \
+ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljetplus.dev ln03.dev lp2563.dev \
+m8510.dev mgr4.dev mgr8.dev mgrgray2.dev \
+mgrgray4.dev mgrgray8.dev mgrmono.dev \
+necp6.dev oce9050.dev oki182.dev paintjet.dev pbm.dev pbmraw.dev pcx16.dev \
+pcx24b.dev pcx256.dev pcxgray.dev pcxmono.dev \
+pdfwrite.dev pgm.dev pgmraw.dev \
+pgnm.dev pgnmraw.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev png16.dev \
+png16m.dev png256.dev pnggray.dev pngmono.dev pnm.dev pnmraw.dev ppm.dev \
+ppmraw.dev psmono.dev r4081.dev sgirgb.dev sj48.dev st800.dev stcolor.dev \
+sxlcrt.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev tiff12nc.dev \
+tiff24nc.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev \
+tiffpack.dev x11.dev x11alpha.dev x11cmyk.dev x11mono.dev xes.dev
+DEVICE_DEVS3=
+DEVICE_DEVS4=
+DEVICE_DEVS6=
+DEVICE_DEVS7=
+DEVICE_DEVS8=
+DEVICE_DEVS9=
+DEVICE_DEVS10=
+DEVICE_DEVS11=
+DEVICE_DEVS12=
+DEVICE_DEVS13=
+DEVICE_DEVS15=
 
 # ---------------------------- End of options --------------------------- #