[package] fix openswan compilation (#5261)

[openwrt/svn-archive/archive.git] / net / openswan / Makefile

diff --git a/net/openswan/Makefile b/net/openswan/Makefile
index 3901c3605b60d483258f5887ab796b0d52d899a8..72dfd77653f82b41480726c9d282e68991a9cfd2 100644 (file)
--- a/net/openswan/Makefile
+++ b/net/openswan/Makefile
@@ -1,10 +1,9 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -22,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/openswan/Default
   TITLE:=Openswan
   URL:=http://www.openswan.org/
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@LINUX_2_6 @!LINUX_2_6_30
 endef
 
 define Package/openswan/Default/description
@@ -55,12 +54,7 @@ $(call Package/openswan/Default/description)
  This package contains the Openswan kernel module.
 endef
 
-TARGET_CPPFLAGS = \
-       -I$(STAGING_DIR)/usr/include \
-       -I$(LINUX_DIR)/include
-
-TARGET_LDFLAGS = \
-       -L$(STAGING_DIR)/usr/lib
+TARGET_CPPFLAGS += -I$(LINUX_DIR)/include
 
 OPENSWAN_MAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
        $(TARGET_CONFIGURE_OPTS) \
@@ -68,7 +62,7 @@ OPENSWAN_MAKE := $(MAKE) -C $(PKG_BUILD_DIR) \
        KERNELSRC="$(LINUX_DIR)" \
        ARCH="$(LINUX_KARCH)" \
        CROSS_COMPILE="$(TARGET_CROSS)" \
-       USERCOMPILE="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
+       USERCOMPILE="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/ports/linux/include -I$(PKG_BUILD_DIR)/linux/include -I$(PKG_BUILD_DIR)/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
        IPSECDIR="/usr/lib/ipsec" \
        INC_USRLOCAL="/usr" \
        INC_RCDEFAULT="/etc/init.d" \