diff -Nur gs6.0.orig/src/contrib.mak gs6.0/src/contrib.mak
--- gs6.0.orig/src/contrib.mak	Sat Aug 14 08:07:40 1999
+++ gs6.0/src/contrib.mak	Sat Feb 19 23:38:48 2000
@@ -78,9 +78,9 @@
 # *	lj3100sw H-P LaserJet 3100 (requires installed HP-Software)
 # +	lj4dith  H-P LaserJet 4 with Floyd-Steinberg dithering
 # *	lp8000	Epson LP-8000 laser printer
-# *     lq850   Epson LQ850 printer at 360 x 360 DPI resolution;
-#               also good for Canon BJ300 with LQ850 emulation
-# *	lxm5700m Lexmark 5700 monotone
+# *	lq850   Epson LQ850 printer at 360 x 360 DPI resolution;
+#		also good for Canon BJ300 with LQ850 emulation
+# *	lxm5700m Lexmark 5700 black 1200dpi
 # *	m8510	C.Itoh M8510 printer
 # *	necp6	NEC P6/P6+/P60 printers at 360 x 360 DPI resolution
 # *	nwp533  Sony Microsystems NWP533 laser printer   [Sony only]
diff -Nur gs6.0.orig/src/unix-gcc.mak gs6.0/src/unix-gcc.mak
--- gs6.0.orig/src/unix-gcc.mak	Fri Feb  4 04:07:22 2000
+++ gs6.0/src/unix-gcc.mak	Wed Feb 23 10:44:04 2000
@@ -56,7 +56,7 @@
 INSTALL_PROGRAM = $(INSTALL) -m 755
 INSTALL_DATA = $(INSTALL) -m 644
 
-prefix = /usr/local
+prefix = /usr
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 scriptdir = $(bindir)
@@ -67,14 +67,14 @@
 gsdir = $(datadir)/ghostscript
 gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
 
-docdir=$(gsdatadir)/doc
+docdir=$(prefix)/doc/ghostscript-$(GS_DOT_VERSION)
 exdir=$(gsdatadir)/examples
 GS_DOCDIR=$(docdir)
 
 # Define the default directory/ies for the runtime
 # initialization and font files.  Separate multiple directories with a :.
 
-GS_LIB_DEFAULT=$(gsdatadir)/lib:$(gsdir)/fonts
+GS_LIB_DEFAULT=$(gsdatadir)/lib:/usr/share/fonts/default/Type1:/usr/share/fonts/default/ghostscript
 
 # Define whether or not searching for initialization files should always
 # look in the current directory first.  This leads to well-known security
@@ -192,7 +192,7 @@
 # the 2.7.0-2.7.2 optimizer bug, either "-Dconst=" or
 # "-Wcast-qual -Wwrite-strings" is automatically included.
 
-GCFLAGS=-Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -Wtraditional -fno-builtin -fno-common
+GCFLAGS=$(RPM_OPT_FLAGS) -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -Wtraditional -fno-builtin -fno-common
 
 # Define the added flags for standard, debugging, and profiling builds.
 
@@ -252,7 +252,8 @@
 # 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/local/X/include
+XINCLUDE=-I/usr/X11/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
@@ -269,7 +270,8 @@
 #XLIBDIRS=-L/usr/local/X/lib
 XLIBDIRS=-L/usr/X11/lib
 XLIBDIR=
-XLIBS=Xt Xext X11
+#XLIBS=Xt Xext X11
+XLIBS=Xt SM ICE Xext X11
 
 # Define whether this platform has floating point hardware:
 #	FPU_TYPE=2 means floating point is faster than fixed point.