simplify and fix adm5120 image building, fix broken FEATURES handling

[openwrt.git] / package / ipsec-tools / Makefile

diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index 5951649..a1afe62 100644 (file)
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -7,6 +7,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipsec-tools
 PKG_VERSION:=0.6.6
@@ -15,13 +16,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/ipsec-tools
 PKG_MD5SUM:=e908f3cf367e31c7902df5ab16fbe5c3
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 define Package/ipsec-tools
   SECTION:=net
@@ -31,15 +27,7 @@ define Package/ipsec-tools
   URL:=http://ipsec-tools.sourceforge.net/
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); touch \
-               configure.ac \
-               aclocal.m4 \
-               Makefile.in \
-               config.h.in \
-               configure \
-       );
-       $(call Build/Configure/Default, \
+CONFIGURE_ARGS += \
                --enable-shared \
                --enable-static \
                --with-kernel-headers="$(LINUX_DIR)/include" \
@@ -48,8 +36,17 @@ define Build/Configure
                --without-libradius \
                --without-libpam \
                --enable-dpd \
-               --enable-natt \
+               --enable-natt
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR); touch \
+               configure.ac \
+               aclocal.m4 \
+               Makefile.in \
+               config.h.in \
+               configure \
        );
+       $(call Build/Configure/Default)
 endef
 
 # override CFLAGS holding "-Werror" that break builds on compile warnings