X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..8eb85e1628864e1ab4e77207738502466cc9d5d2:/package/isakmpd/Makefile

diff --git a/package/isakmpd/Makefile b/package/isakmpd/Makefile
index a4e7ff7b0..922944914 100644
--- 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.
 #
-# $Id: Makefile 4619 2006-08-22 09:50:02Z florian $
+# $Id$
 
 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_CAT:=zcat
 
 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
@@ -26,25 +24,27 @@ include $(INCLUDE_DIR)/kernel.mk
 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
-	$(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) -j1 \
+		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) \
-		STAGING_DIR="$(STAGING_DIR)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INSTALL="install -c" \
 		install-bin
 endef
 
 define Package/isakmpd/install
-	install -d -m0755 $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef