From: Schantl Stefan <Stevee@ipfire.org>
Date: Sun, 14 Mar 2010 19:31:00 +0000 (+0100)
Subject: zlib: Clean up naoki-makefile.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78bddcefbacbdb6be220583f7ba865f0549cc766;p=ipfire-3.x.git

zlib: Clean up naoki-makefile.
---

diff --git a/pkgs/core/zlib/zlib.nm b/pkgs/core/zlib/zlib.nm
index 222594ac5..3d21e155c 100644
--- a/pkgs/core/zlib/zlib.nm
+++ b/pkgs/core/zlib/zlib.nm
@@ -47,25 +47,17 @@ PKG_TARBALL    = $(THISAPP).tar.gz
 
 CFLAGS        += -fPIC -DPIC
 
-###############################################################################
-# Installation Details
-###############################################################################
+CONFIGURE_ENVIRONMENT += ac_cv_func_working_mktime=yes
 
-define STAGE_BUILD
-	cd $(DIR_APP) && \
-		ac_cv_func_working_mktime=yes \
-		./configure \
-			--prefix=/usr \
-			--libdir=/lib
-	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-endef
+CONFIGURE_OPTIONS += \
+	--prefix=/usr \
+	--libdir=/lib
 
 define STAGE_TEST
 	cd $(DIR_APP) && make check
 endef
 
-define STAGE_INSTALL
-	cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT)
+define STAGE_INSTALL_CMDS
 	-mkdir -pv $(BUILDROOT)/usr/{include,lib}
 	cd $(DIR_APP) && cp -pfv zconf.h zlib.h $(BUILDROOT)/usr/include
 	rm -vf $(BUILDROOT)/lib/libz.so