X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/77c87e07cfa1eee90e87eb33bd6c981a2157fa5e..c87639a6750e646db6fc4d39cecb2470386001d1:/package/zlib/Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 15407d5a3..8c7f9f944 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -4,13 +4,12 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.3
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
@@ -29,7 +28,7 @@ define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		$(TARGET_CONFIGURE_OPTS) \
 		LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
-		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+		CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
 		UNAME_S="Linux" \
 		./configure \
 			--prefix=/usr \
@@ -40,7 +39,7 @@ endef
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+		CFLAGS="$(TARGET_CFLAGS) -fPIC" \
 		libz.a libz.so
 	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -49,17 +48,12 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
+	mkdir -p $(1)/usr/include
 	$(CP)	$(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \
-		$(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
+		$(1)/usr/include/
+	mkdir -p $(1)/usr/lib
 	$(CP)	$(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
-		$(STAGING_DIR)/usr/lib/
-endef
-	
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/z{conf,lib}.h \
-		$(STAGING_DIR)/usr/lib/libz.{a,so*}
+		$(1)/usr/lib/
 endef
 
 # libz.so is needed for openssl (zlib-dynamic)