From b95d8b41c4201d678274f78c96684d5e9343b2fa Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Fri, 23 Sep 2016 14:29:49 -0700
Subject: [PATCH] zlib: use cmake configuration

---
 packages/compress/zlib/package.mk | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk
index a1f74b347a..5b8b074857 100644
--- a/packages/compress/zlib/package.mk
+++ b/packages/compress/zlib/package.mk
@@ -33,37 +33,25 @@ PKG_LONGDESC="zlib is a general purpose data compression library. All the code i
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-TARGET_CONFIGURE_OPTS="--prefix=/usr"
-HOST_CONFIGURE_OPTS="--prefix=$ROOT/$TOOLCHAIN"
-
 post_configure_target() {
  ## configure minizip
  (
-  cd $ROOT/$PKG_BUILD/.$TARGET_NAME/contrib/minizip
+  cd $ROOT/$PKG_BUILD/contrib/minizip
   rm Makefile
   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:../../"
   do_autoreconf
+  cp $ROOT/$PKG_BUILD/.$TARGET_NAME/zconf.h ./
   ./configure --host=$TARGET_NAME --build=$HOST_NAME $TARGET_CONFIGURE_OPTS --disable-shared --enable-static
  )
 }
 
-pre_build_target() {
-  mkdir -p $PKG_BUILD/.$TARGET_NAME
-  cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
-}
-
-pre_build_host() {
-  mkdir -p $PKG_BUILD/.$HOST_NAME
-  cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
-}
-
 post_make_target() {
  # make minizip
- make -C $ROOT/$PKG_BUILD/.$TARGET_NAME/contrib/minizip
+ make -C $ROOT/$PKG_BUILD/contrib/minizip
 }
 
 post_makeinstall_target() {
  # Install minizip
- make -C $ROOT/$PKG_BUILD/.$TARGET_NAME/contrib/minizip DESTDIR=$SYSROOT_PREFIX install
+ make -C $ROOT/$PKG_BUILD/contrib/minizip DESTDIR=$SYSROOT_PREFIX install
 }