Fix the imagebuilder generation (does not mean it works with the recent changes)

[openwrt.git] / package / strongswan / Makefile

diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile
index 43a7880..65a77be 100644 (file)
--- a/package/strongswan/Makefile
+++ b/package/strongswan/Makefile
@@ -11,54 +11,57 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=strongswan
 PKG_VERSION:=2.8.2
 
 PKG_NAME:=strongswan
 PKG_VERSION:=2.8.2

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.strongswan.org/
 PKG_MD5SUM:=57427f5b48123851a73b10d78dd4f8d6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.strongswan.org/
 PKG_MD5SUM:=57427f5b48123851a73b10d78dd4f8d6

-PKG_CAT:=bzcat

 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/strongswan/Default
   TITLE:=strongSwan
   DEPENDS:=@LINUX_2_4
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/strongswan/Default
   TITLE:=strongSwan
   DEPENDS:=@LINUX_2_4

-  DESCRIPTION:=\
-       strongSwan is an IPsec implementation for Linux.

   URL:=http://www.strongswan.org/
 endef
 
   URL:=http://www.strongswan.org/
 endef
 

+define Package/strongswan/Default/description
+ strongSwan is an IPsec implementation for Linux.
+endef
+

 define Package/strongswan
 define Package/strongswan

-  $(call Package/strongswan/Default)
+$(call Package/strongswan/Default)

   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+kmod-strongswan +libgmp @LINUX_2_4
   TITLE+= (daemon)
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+kmod-strongswan +libgmp @LINUX_2_4
   TITLE+= (daemon)

-  DESCRIPTION+=\\\
-       \\\
-       This package contains the strongSwan user-land daemon.
-  URL:=http://www.strongswan.org/
+endef
+
+define Package/strongswan/description
+$(call Package/strongswan/Default/description)
+ This package contains the strongSwan user-land daemon.

 endef
 
 define KernelPackage/strongswan
 endef
 
 define KernelPackage/strongswan

+$(call Package/strongswan/Default)

   SUBMENU:=Network Support
   SUBMENU:=Network Support

-  $(call Package/strongswan/Default)

   TITLE+= (kernel module)
   DEPENDS:=@LINUX_2_4
   TITLE+= (kernel module)
   DEPENDS:=@LINUX_2_4

-  DESCRIPTION+=\\\
-       \\\
-       This package contains the strongSwan kernel module.
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)

   FILES:=$(PKG_BUILD_DIR)/linux/net/ipsec/ipsec.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipsec)
 endef
 
   FILES:=$(PKG_BUILD_DIR)/linux/net/ipsec/ipsec.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipsec)
 endef
 

+define KernelPackage/strongswan/description
+$(call Package/strongswan/Default/description)
+ This package contains the strongSwan kernel module.
+endef
+

 PKG_MAKE_OPTS:= \
                LINUX_RELEASE="$(LINUX_RELEASE)" \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
 PKG_MAKE_OPTS:= \
                LINUX_RELEASE="$(LINUX_RELEASE)" \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \

-               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \
+               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \

                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 
                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 


@@ -66,7 +69,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \

-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef
                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef