-diff -urN libpng-1.2.1.org/contrib/pngminus/makefile.std libpng-1.2.1/contrib/pngminus/makefile.std
---- libpng-1.2.1.org/contrib/pngminus/makefile.std Wed Mar 13 11:40:24 2002
-+++ libpng-1.2.1/contrib/pngminus/makefile.std Wed Mar 13 11:46:05 2002
-@@ -19,13 +19,13 @@
+--- libpng-1.5.7/contrib/pngminus/makefile.std.orig 2011-12-15 16:45:32.000000000 +0100
++++ libpng-1.5.7/contrib/pngminus/makefile.std 2011-12-18 16:24:38.099367091 +0100
+@@ -12,21 +12,21 @@
+ #PNGLIB = -L$(PNGPATH)/lib -lpng16
+ #PNGLIBS = $(PNGPATH)/lib/libpng16.a
+ PNGINC = -I../..
+-PNGLIB = -L../.. -lpng
++PNGLIB = -L../.. -L../../.libs -lpng16
+ PNGLIBS = ../../libpng.a
+
+ #ZPATH = /usr/local
#ZINC = -I$(ZPATH)/include
#ZLIB = -L$(ZPATH)/lib -lz
#ZLIBS = $(ZPATH)/lib/libz.a
-ZINC = -I../../../zlib
-ZLIB = -L../../../zlib -lz
-ZLIBS = ../../../zlib/libz.a
-+ZINC =
++ZINC =
+ZLIB = -lz
+ZLIBS = -lz
--CFLAGS=-O3 $(PNGINC) $(ZINC)
-+CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
- LDFLAGS=$(PNGLIB) $(ZLIB)
--LDFLAGSS=$(PNGLIBS) $(ZLIBS)
-+LDFLAGSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
+-CPPFLAGS=$(PNGINC) $(ZINC)
++CPPFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
+ CFLAGS=
+ LDLIBS=$(PNGLIB) $(ZLIB)
+-LDLIBSS=$(PNGLIBS) $(ZLIBS)
++LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
C=.c
O=.o
L=.a
+@@ -33,8 +33,7 @@
+
+ # dependencies
+
+-#all: png2pnm$(E) pnm2png$(E)
+-all: png2pnm$(E) pnm2png$(E) png2pnm-static$(E) pnm2png-static$(E)
++all: png2pnm$(E) pnm2png$(E)
+
+ png2pnm$(O): png2pnm$(C)
+ $(CC) -c $(CFLAGS) png2pnm$(C)