*** unix-gcc.mak.orig	Tue Jul  2 12:50:36 1996
--- unix-gcc.mak	Tue Jul  2 12:49:53 1996
***************
*** 88,94 ****
  # You may haveneed change this if the IJG library version changes.
  # See jpeg.mak for more information.
  
! JSRCDIR=jpeg-6a
  JVERSION=6
  
  # Define the directory where the PNG library sources are stored,
--- 88,94 ----
  # You may haveneed change this if the IJG library version changes.
  # See jpeg.mak for more information.
  
! JSRCDIR=../jpeg-6a
  JVERSION=6
  
  # Define the directory where the PNG library sources are stored,
***************
*** 136,142 ****
  #   gcc to accept ANSI-style function prototypes and function definitions.
  
  #CFLAGS=-g -O $(GCFLAGS) $(XCFLAGS)
! CFLAGS=-O $(GCFLAGS) $(XCFLAGS)
  #CFLAGS=-g $(GCFLAGS) $(XCFLAGS)
  
  # Define platform flags for ld.
--- 136,142 ----
  #   gcc to accept ANSI-style function prototypes and function definitions.
  
  #CFLAGS=-g -O $(GCFLAGS) $(XCFLAGS)
! CFLAGS=-O $(GCFLAGS) $(XCFLAGS) -Dconst=
  #CFLAGS=-g $(GCFLAGS) $(XCFLAGS)
  
  # Define platform flags for ld.
***************
*** 174,182 ****
  #XLIBS=Xt SM ICE Xext X11
  
  #XLIBDIRS=-L/usr/local/X/lib
! XLIBDIRS=-L/usr/X11/lib
  XLIBDIR=
! XLIBS=Xt Xext X11
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
--- 174,182 ----
  #XLIBS=Xt SM ICE Xext X11
  
  #XLIBDIRS=-L/usr/local/X/lib
! XLIBDIRS=-L/usr/X11R6/lib
  XLIBDIR=
! 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.
***************
*** 205,219 ****
  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
  
  # ---------------------------- End of options --------------------------- #
  
--- 205,219 ----
  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
  
  # ---------------------------- End of options --------------------------- #