X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Flibtasn1%2FMakefile;h=bbfeaefe02d95753b93f23b5653853d46ea45528;hb=d1cac1e5359aa75d50ece672bb3f057715bdc81c;hp=8d1d98055e07292bd6b7d03c6b100bc498994f31;hpb=f200c1bf2ce3dc38b561fc8b9282748006b66fab;p=packages.git

diff --git a/libs/libtasn1/Makefile b/libs/libtasn1/Makefile
index 8d1d98055..bbfeaefe0 100644
--- a/libs/libtasn1/Makefile
+++ b/libs/libtasn1/Makefile
@@ -12,7 +12,6 @@ PKG_NAME:=libtasn1
 PKG_VERSION:=0.2.13
 PKG_RELEASE:=0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
 	ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/libtasn1/ \
@@ -22,6 +21,7 @@ PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
 PKG_MD5SUM:=d124b11908cfb88883fe71472c25d53a
 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
@@ -30,63 +30,33 @@ define Package/libtasn1
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=An ASN.1 and DER structures manipulation library
-  DESCRIPTION:=An ASN.1 and DER structures manipulation library. \\\
-    This is a library for Abstract Syntax Notation One (ASN.1) and \\\
-    Distinguish Encoding Rules (DER) manipulation.
+  DESCRIPTION:=\
+	This is a library for Abstract Syntax Notation One (ASN.1) and \\\
+	Distinguish Encoding Rules (DER) manipulation.
   URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		touch configure.ac ; \
-		touch acinclude.m4 ; \
-		touch aclocal.m4 ; \
-		touch Makefile.in ; \
-		touch config.h.in ; \
-		touch configure ; \
-		$(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" \
-		./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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
+	(cd $(PKG_BUILD_DIR); touch \
+		configure.ac \
+		acinclude.m4 \
+		aclocal.m4 \
+		Makefile.in \
+		config.h.in \
+		configure \
 	);
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+	)
 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/libtasn1/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/
@@ -106,4 +76,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/share/aclocal/libtasn1.m4
 endef
 
+define Package/libtasn1/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libtasn1))