From c4d4bbbe9dfa7e82cd5da2853610d3167442de87 Mon Sep 17 00:00:00 2001 From: Stefan Paletta Date: Wed, 7 Jun 2006 08:33:51 +0000 Subject: [PATCH] Stefan Paletta: zlib: don't use cp to install shared libraries! also, prefix='' blows and some general love to the package [2006052516583431996] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7615 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/zlib/zlib.conf | 4 ++-- package/base/zlib/zlib.desc | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/base/zlib/zlib.conf b/package/base/zlib/zlib.conf index 52e06cab2..b0477cddd 100644 --- a/package/base/zlib/zlib.conf +++ b/package/base/zlib/zlib.conf @@ -20,8 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -prefix='' -set_confopt +libdir=$root/lib zlib_pm() { # create a static version @@ -33,6 +32,7 @@ zlib_pm() { var_insert confopt " " "--shared" var_append makeinstopt " " "mandir=$mandir" hook_add preconf 3 "unset AR" +hook_add premake 3 "sed -ie 's,cp ,install ,' Makefile" hook_add postmake 3 "zlib_pm" # optimized code diff --git a/package/base/zlib/zlib.desc b/package/base/zlib/zlib.desc index 8d4b630c7..2b9911beb 100644 --- a/package/base/zlib/zlib.desc +++ b/package/base/zlib/zlib.desc @@ -23,14 +23,11 @@ [I] The zlib general purpose data compression library. -[T] zlib 1.2.1 is a general purpose data compression library. All the code +[T] zlib is a general purpose data compression library. All the code [T] is thread safe. The data format used by the zlib library [T] is described by RFCs (Request for Comments) 1950 to 1952 in the files [T] ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate [T] format) and rfc1952.txt (gzip format). -[T] -[T] All functions of the compression library are documented in the file zlib.h. -[T] (volunteer to write man pages welcome, contact jloup@gzip.org). [U] http://www.zlib.net/