diff options
| author | Steven Barth <steven@midlink.org> | 2014-12-04 11:37:16 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-02-13 12:16:51 +0100 |
| commit | 00c2f3d436fb31e1b9b43bd7d694e82511e7748e (patch) | |
| tree | 032fe863c1b68b8edd628b661d83e7801b6e9f2a | |
| parent | 29f23f24d599d8acac6c8c9cee796c1f3bf690e2 (diff) | |
strongswan: correctly install plugin include configs
Signed-off-by: Steven Barth <steven@midlink.org>
| -rw-r--r-- | net/strongswan/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 58bc004eb..d0e67e458 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.2.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://download.strongswan.org/ http://download2.strongswan.org/ @@ -298,22 +298,16 @@ define BuildPlugin DEPENDS:= +strongswan $(3) endef - strongswan_mod_conf=$(wildcard $(PKG_INSTALL_DIR)/etc/strongswan.d/charon/$(1).conf) define Package/strongswan-mod-$(1)/install $(INSTALL_DIR) $$(1)/etc/strongswan.d/charon - $(if $(call strongswan_mod_conf,$(1)), \ - $(INSTALL_DATA) \ - $(call strongswan_mod_conf,$(1)) \ - $$(1)/etc/strongswan.d/charon/ \ - ) + if [ -f $(PKG_INSTALL_DIR)/etc/strongswan.d/charon/$(1).conf ]; then \ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/strongswan.d/charon/$(1).conf $$(1)/etc/strongswan.d/charon/; fi $(INSTALL_DIR) $$(1)/usr/lib/ipsec/plugins $(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-$(1).so \ $$(1)/usr/lib/ipsec/plugins/ $(call Plugin/$(1)/install,$$(1)) endef - Package/strongswan-mod-$(1)/conffiles=$(patsubst $(PKG_INSTALL_DIR)%,%,$(call strongswan_mod_conf,$(1))) - $$(eval $$(call BuildPackage,strongswan-mod-$(1))) endef |