diff --git a/archiver/zlib/zlib.conf b/archiver/zlib/zlib.conf index de7f98df9..d1444df57 100644 --- a/archiver/zlib/zlib.conf +++ b/archiver/zlib/zlib.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../zlib/zlib.conf -# Copyright (C) 2008 The OpenSDE Project +# Copyright (C) 2008 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -21,7 +21,7 @@ zlib_pm() { # create a static version make libz.a cp -v libz.a $root/$libdir - cp -v algorithm.txt $root/$docdir + cp -v doc/algorithm.txt $root/$docdir } if [ "$SDECFG_STATIC" = "0" ] ; then @@ -29,8 +29,6 @@ if [ "$SDECFG_STATIC" = "0" ] ; then hook_add postmake 3 "zlib_pm" fi -var_append AR " " "rc" - var_append makeinstopt " " "prefix=$root/$prefix" var_append makeinstopt " " "libdir=$root/$libdir" var_append makeinstopt " " "includedir=$root/$includedir" diff --git a/archiver/zlib/zlib.desc b/archiver/zlib/zlib.desc index 7a99d3f2c..4cd174277 100644 --- a/archiver/zlib/zlib.desc +++ b/archiver/zlib/zlib.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../zlib/zlib.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -37,8 +37,8 @@ [L] OpenSource [S] Stable -[V] 1.2.3 +[V] 1.2.5 [P] X -?-3-----9 105.900 -[D] 623948124 zlib-1.2.3.tar.bz2 http://www.zlib.net/ +[D] 2570509682 zlib-1.2.5.tar.bz2 http://www.zlib.net/