fix libmcrypt-config, use Build/Configure/Default macro

git-svn-id: svn://svn.openwrt.org/openwrt/packages@5264 3c298f89-4303-0410-b956-a3cf2f4a3e73

libs/libmcrypt/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libmcrypt
 PKG_VERSION:=2.5.7
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 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,58 +26,26 @@ define Package/libmcrypt
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Cryptographic library
-  DESCRIPTION:=Cryptographic library.\\\
+  DESCRIPTION:=\
-    libmcrypt is a cryptographic library that conveniently brings \\\
+	libmcrypt is a cryptographic library that conveniently brings \\\
-    together a variety of ciphers for convenient use.
+	together a variety of ciphers for convenient use.
   URL:=http://mcrypt.sourceforge.net/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--with-gnu-ld \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lm" \
+	)
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--prefix=$(PKG_INSTALL_DIR) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libmcrypt/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.so.* $(1)/usr/lib
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/mcrypt.h $(STAGING_DIR)/usr/include/
@@ -85,8 +53,8 @@ define Build/InstallDev
 	$(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/usr/include,,g' $(STAGING_DIR)/usr/bin/libmcrypt-config
+	$(SED) 's,-I$$$${prefix}/include,,g' $(STAGING_DIR)/usr/bin/libmcrypt-config
-	$(SED) 's,-L/usr/lib,,g' $(STAGING_DIR)/usr/bin/libmcrypt-config
+	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(STAGING_DIR)/usr/bin/libmcrypt-config
 endef
 
 define Build/UninstallDev
@@ -96,4 +64,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/bin/mcrypt-config
 endef
 
+define Package/libmcrypt/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmcrypt.so.* $(1)/usr/lib
+endef
+
 $(eval $(call BuildPackage,libmcrypt))