use Build/Configure/Default macro, Makefile cleanup

[openwrt/svn-archive/archive.git] / utils / gnupg / Makefile

diff --git a/utils/gnupg/Makefile b/utils/gnupg/Makefile
index 4ea1dc2f4851be4b25e2e8197546235a818fa205..e928ca88e73fdf3e25bcc0271aa49c5196304347 100644 (file)
--- a/utils/gnupg/Makefile
+++ b/utils/gnupg/Makefile
@@ -12,73 +12,47 @@ PKG_NAME:=gnupg
 PKG_VERSION:=1.4.2.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg \
        ftp://ftp.gnupg.org/gcrypt/gnupg
 PKG_MD5SUM:=2d59ed50d92f69994dbfbe00fe1612e4
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gnupg
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=GNU Privacy Guard
-  DESCRIPTION:=GNU Privacy Guard (GnuPG).\\\
-    GPG is an encryption program.
+  DESCRIPTION:=\
+       GPG is an encryption program.
   URL:=http://www.gnupg.org/
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ac_cv_c_bigendian=no \
-               ac_cv_sizeof_off_t=8 \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --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_LARGEFILE) \
-                       $(DISABLE_NLS) \
-                       --disable-asm \
-                       --disable-gnupg-iconv \
-                       --disable-card-support \
-                       --disable-agent-support \
-                       --disable-bzip2 \
-                       --disable-exec \
-                       --disable-ldap \
-                       --disable-hkp \
-                       --disable-finger \
-                       --disable-ftp \
-                       --disable-dns-srv \
-                       --enable-fake-curl \
-                       --disable-nls \
-                       --disable-rpath \
-                       --disable-regex \
-       );
+       $(call Build/Configure/Default, \
+               --disable-rpath \
+               --with-gnu-ld \
+               --disable-asm \
+               --disable-gnupg-iconv \
+               --disable-card-support \
+               --disable-agent-support \
+               --disable-bzip2 \
+               --disable-exec \
+               --disable-ldap \
+               --disable-hkp \
+               --disable-finger \
+               --disable-ftp \
+               --disable-dns-srv \
+               --enable-fake-curl \
+               --disable-regex \
+       )
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC="$(TARGET_CC)"
+       $(MAKE) -C $(PKG_BUILD_DIR)
 endef
 
 define Package/gnupg/install