*** sourceold/unix/makefile	Tue Sep  3 08:48:13 1996
--- source/unix/makefile	Tue Dec  3 22:49:24 1996
***************
*** 28,44 ****
  # Use libXXX.a if you want to force static linking of the libraries.
  #   Use -Llibdir -lXXX if you want to use shared libraries (if they are
  #   available).  It doesn't matter if you only have libXXX.a libraries.
! PNGDIR = $(SRCDIR)/libpng
! LIBPNGINC = -I$(PNGDIR)
  #LIBPNGLIB = $(PNGDIR)/libpng.a
! LIBPNGLIB = -L$(PNGDIR) -lpng
! #LIBPNGLIB = -L/usr/local/lib -lpng
  
! ZLIBDIR = $(SRCDIR)/zlib
! ZLIBINC = -I$(ZLIBDIR)
  #ZLIBLIB = $(ZLIBDIR)/libz.a
! ZLIBLIB = -L$(ZLIBDIR) -lz
! #ZLIBLIB = -L/usr/local/lib -lz
  
  # This is the suffix for object files.
  OBJ     = .o
--- 28,44 ----
  # Use libXXX.a if you want to force static linking of the libraries.
  #   Use -Llibdir -lXXX if you want to use shared libraries (if they are
  #   available).  It doesn't matter if you only have libXXX.a libraries.
! PNGDIR = #$(SRCDIR)/libpng
! LIBPNGINC = -I/usr/local/include
  #LIBPNGLIB = $(PNGDIR)/libpng.a
! #LIBPNGLIB = -L$(PNGDIR) -lpng
! LIBPNGLIB = -L/usr/local/lib -lpng
  
! #ZLIBDIR = $(SRCDIR)/zlib
! #ZLIBINC = -I$(ZLIBDIR)
  #ZLIBLIB = $(ZLIBDIR)/libz.a
! #ZLIBLIB = -L$(ZLIBDIR) -lz
! ZLIBLIB =  -lz
  
  # This is the suffix for object files.
  OBJ     = .o
***************
*** 55,61 ****
  #X11 = /usr/local/X11R6
  #X11 = /usr/openwin        # for some SunOS systems
  #X11 = /usr/lpp/X11        # for some AIX systems
! X11 = /usr/X11
  
  # You probably won't need to change these if you have the X11 variable
  #   above set properly...
--- 55,61 ----
  #X11 = /usr/local/X11R6
  #X11 = /usr/openwin        # for some SunOS systems
  #X11 = /usr/lpp/X11        # for some AIX systems
! X11 = /usr/X11R6
  
  # You probably won't need to change these if you have the X11 variable
  #   above set properly...
***************
*** 901,907 ****
                            config.h             \
                            $(SRCDIR)/frame.h    \
                            $(SRCDIR)/optout.h   \
-                           $(PNGDIR)/png.h      \
                            $(SRCDIR)/png_pov.h  \
                            $(SRCDIR)/point.h    \
                            $(SRCDIR)/povproto.h \
--- 901,906 ----
*** source/unix/makefile~	Wed Dec 30 16:07:40 1998
--- source/unix/makefile	Wed Dec 30 16:09:21 1998
***************
*** 79,85 ****
  #   for compiles unless you are debugging new code, as it slows things down.
  # The option -DPOV_COMMENTS enables informational comments in PNG and PPM
  #   format output files (see png_pov.c and ppm.c for more info).
! CFLAGS      = -O2 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
  LFLAGS      = $(LIBPNGLIB) $(ZLIBLIB) -lm
  
  # Linux compiler flags
--- 79,87 ----
  #   for compiles unless you are debugging new code, as it slows things down.
  # The option -DPOV_COMMENTS enables informational comments in PNG and PPM
  #   format output files (see png_pov.c and ppm.c for more info).
! CFLAGS      ?= -O2
! CFLAGS      += -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
! 
  LFLAGS      = $(LIBPNGLIB) $(ZLIBLIB) -lm
  
  # Linux compiler flags
