simplify and fix adm5120 image building, fix broken FEATURES handling

[openwrt.git] / package / isakmpd / Makefile

diff --git a/package/isakmpd/Makefile b/package/isakmpd/Makefile
index 00153fd..4214fdb 100644 (file)
--- a/package/isakmpd/Makefile
+++ b/package/isakmpd/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id: Makefile 4619 2006-08-22 09:50:02Z florian $
+# $Id$

 
 include $(TOPDIR)/rules.mk
 
 
 include $(TOPDIR)/rules.mk
 


@@ -15,10 +15,8 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/i/isakmpd/
 PKG_MD5SUM:=e6d25a9e232fb186e1a48dc06453bd57
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/i/isakmpd/
 PKG_MD5SUM:=e6d25a9e232fb186e1a48dc06453bd57

-PKG_CAT:=zcat

 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig

-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk


@@ -26,18 +24,20 @@ include $(INCLUDE_DIR)/kernel.mk
 define Package/isakmpd
   SECTION:=net
   CATEGORY:=Network
 define Package/isakmpd
   SECTION:=net
   CATEGORY:=Network

-  DEPENDS:=@BROKEN @LINUX_2_6 +libopenssl +keynote +libgmp
+  DEPENDS:=@LINUX_2_6 +libopenssl +keynote +libgmp

   TITLE:=IPsec management tools
   URL:=http://isakmpd.sourceforge.net/
 endef
 
 define Build/Compile
   TITLE:=IPsec management tools
   URL:=http://isakmpd.sourceforge.net/
 endef
 
 define Build/Compile

-       $(call Build/Compile/Default,LINUX_DIR="$(LINUX_DIR)" \
-               STAGING_DIR="$(STAGING_DIR)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-       )
+       CFLAGS="$(TARGET_CFLAGS)" \
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               LINUX_DIR="$(LINUX_DIR)" \
+               EXTRA_CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/openssl -I$(STAGING_DIR)/usr/include/keynote" \
+               EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
+

        $(MAKE) -C $(PKG_BUILD_DIR) \
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               STAGING_DIR="$(STAGING_DIR)" \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                INSTALL="install -c" \
                install-bin
                DESTDIR="$(PKG_INSTALL_DIR)" \
                INSTALL="install -c" \
                install-bin