X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/de4be9af1e051a72b7cbd0a892b4154a8e64d226..6c640d00dec772eb9651e25eedbe032e1e802e33:/package/strongswan/Makefile?ds=sidebyside diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index fdd8636ef..9993b3b03 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -16,10 +16,6 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://download.strongswan.org/ PKG_MD5SUM:=57427f5b48123851a73b10d78dd4f8d6 -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 @@ -61,7 +57,7 @@ PKG_MAKE_OPTS:= \ 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" \ @@ -69,7 +65,7 @@ define Build/Compile $(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