X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2c04bf02f39515f339c96d58001d922efb2f5f3c..8c5dc0c237dc43601a7cbfe6b8c6f2484f526d14:/package/ipsec-tools/Makefile diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index feccbbb5e..a1afe6283 100644 --- 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 @@ -62,7 +59,7 @@ endef define Package/ipsec-tools/install $(INSTALL_DIR) $(1)/etc - install -m0600 $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/ + $(INSTALL_CONF) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/ $(INSTALL_DIR) $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/