Cleanup the saved_builtin_dir mess. Fixes that the xserver crashed when it was

[openwrt/svn-archive/archive.git] / libs / libmcrypt / Makefile

diff --git a/libs/libmcrypt/Makefile b/libs/libmcrypt/Makefile
index 8e53eebe27066a8271eb8b2e44f43185b9caf68d..112e53b36e5664396ba78e341e375cf38ae0c133 100644 (file)
--- a/libs/libmcrypt/Makefile
+++ b/libs/libmcrypt/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -15,10 +14,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mcrypt
 PKG_MD5SUM:=b1be163143f8e8ed0474beeb642b3bad
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,12 +21,14 @@ define Package/libmcrypt
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Cryptographic library
-  DESCRIPTION:=\
-       libmcrypt is a cryptographic library that conveniently brings \\\
-       together a variety of ciphers for convenient use.
   URL:=http://mcrypt.sourceforge.net/
 endef
 
+define Package/libmcrypt/description
+       libmcrypt is a cryptographic library that conveniently brings 
+       together a variety of ciphers for convenient use.
+endef
+
 define Build/Configure
        $(call Build/Configure/Default, \
                --enable-shared \
@@ -39,6 +36,8 @@ define Build/Configure
        )
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -46,21 +45,14 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/mcrypt.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.{a,so*} $(STAGING_DIR)/usr/lib/
-       mkdir -p $(STAGING_DIR)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libmcrypt-config $(STAGING_DIR)/usr/bin/
-       $(SED) 's,-I$$$${prefix}/include,,g' $(STAGING_DIR)/usr/bin/libmcrypt-config
-       $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/bin/libmcrypt-config
-endef
-
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/mcrypt.h \
-               $(STAGING_DIR)/usr/lib/libmcrypt.{a,so*} \
-               $(STAGING_DIR)/usr/bin/mcrypt-config
+       mkdir -p $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/mcrypt.h $(1)/usr/include/
+       mkdir -p $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.{a,so*} $(1)/usr/lib/
+       mkdir -p $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libmcrypt-config $(1)/usr/bin/
+       $(SED) 's,-I$$$${prefix}/include,,g' $(1)/usr/bin/libmcrypt-config
+       $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/libmcrypt-config
 endef
 
 define Package/libmcrypt/install