packages: zlib/minizip-autotools.patch - fixed minizip Makefile.am (it shou...

[sls]

Author: sls                          Date: Fri Oct 23 00:13:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed minizip Makefile.am (it should use fresh zlib headers and libs)

---- Files affected:
packages/zlib:
   minizip-autotools.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/zlib/minizip-autotools.patch
diff -u packages/zlib/minizip-autotools.patch:1.1 packages/zlib/minizip-autotools.patch:1.2
--- packages/zlib/minizip-autotools.patch:1.1	Sun Sep 20 12:55:31 2009
+++ packages/zlib/minizip-autotools.patch	Fri Oct 23 02:13:10 2009
@@ -83,7 +83,7 @@
 diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/Makefile.am zlib-1.2.3.patched/contrib/minizip/Makefile.am
 --- zlib-1.2.3.orig/contrib/minizip/Makefile.am	1969-12-31 17:00:00.000000000 -0700
 +++ zlib-1.2.3.patched/contrib/minizip/Makefile.am	2007-06-28 15:01:34.000000000 -0600
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,41 @@
 +METASOURCES = AUTO
 +
 +pkgconfigdir = $(libdir)/pkgconfig
@@ -115,12 +115,16 @@
 +bin_PROGRAMS = miniunzip minizip
 +
 +miniunzip_SOURCES = miniunz.c
-+miniunzip_LDADD = -L$(top_builddir) -lminizip -lz
++miniunzip_LDADD = -lminizip
++miniunzip_CPPFLAGS = -I../../
 +
 +minizip_SOURCES = minizip.c
-+minizip_LDADD = -L$(top_builddir) -lminizip -lz
-+
++minizip_LDADD = -lminizip
++minizip_CPPFLAGS = -I../../
 +
++libminizip_la_CPPFLAGS = -I../../
++libminizip_la_LIBADD = -lz
++libminizip_la_LDFLAGS = -L../../
 diff -rN -U 5 zlib-1.2.3.orig/contrib/minizip/minizip.pc.in zlib-1.2.3.patched/contrib/minizip/minizip.pc.in
 --- zlib-1.2.3.orig/contrib/minizip/minizip.pc.in	1969-12-31 17:00:00.000000000 -0700
 +++ zlib-1.2.3.patched/contrib/minizip/minizip.pc.in	2007-06-28 14:55:38.000000000 -0600
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zlib/minizip-autotools.patch?r1=1.1&r2=1.2&f=u