- force %{_lib}-independent libdir

[packages/crossmingw32-libpng.git] / libpng-pngminus.patch

diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index a5c26b63d1c28273e2de82fc21528af0436bab81..1ef91b03be06a6d0bf141b58c50a21b2337fc124 100644 (file)
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -1,26 +1,39 @@
---- libpng-1.0.8/contrib/pngminus/makefile.std.old     Sat Nov 27 13:41:26 1999
-+++ libpng-1.0.8/contrib/pngminus/makefile.std Wed Nov  1 13:05:06 2000
-@@ -9,18 +9,18 @@
- RM=rm
- CP=cp
+--- libpng-1.2.10/contrib/pngminus/makefile.std.orig   2006-04-23 20:45:35.000000000 +0200
++++ libpng-1.2.10/contrib/pngminus/makefile.std        2006-05-20 00:07:36.332062500 +0200
+@@ -12,20 +12,20 @@
+ #PNGLIB = -L$(PNGPATH)/lib -lpng12
+ #PNGLIBS = $(PNGPATH)/lib/libpng12.a
+ PNGINC = -I../..
+-PNGLIB = -L../.. -lpng
++PNGLIB = -L../.. -L../../.libs -lpng12
+ PNGLIBS = ../../libpng.a
  
--PNGPATH = /usr/local
-+PNGPATH = ../..
- PNGINC = $(PNGPATH)/include
--#PNGLIB = $(PNGPATH)/lib -lpng
--PNGLIB = $(PNGPATH)/lib/libpng.a
-+PNGLIB = $(PNGPATH)/ -lpng
-+#PNGLIB = $(PNGPATH)/lib/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 = 
++ZLIB = -lz
++ZLIBS = -lz
  
- ZPATH = /usr/local
- ZINC = $(ZPATH)/include
- #ZLIB = $(ZPATH)/lib -lz
- ZLIB = $(ZPATH)/lib/libz.a
- 
--CCFLAGS=-I$(PNGINC) -I$(ZINC)
--LDFLAGS=-L$(PNGLIB) -L$(ZLIB)
-+CCFLAGS=$(RPM_OPT_FLAGS) -I$(PNGINC)
-+LDFLAGS= -s -L$(PNGLIB)
+-CFLAGS=-O3 $(PNGINC) $(ZINC)
++CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
+ LDFLAGS=$(PNGLIB) $(ZLIB)
+-LDFLAGSS=$(PNGLIBS) $(ZLIBS)
++LDFLAGSS=$(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)