lede-packages-rs

commit d5d47cacdda089b5496108d8fa7952133e90b0ff
parent 5a4ffab87b64a868df70ead3bd31f6bdb0802ccb
Author: Hannu Nyman <hannu.nyman@iki.fi>
Date:   Tue,  3 May 2016 17:46:00 +0300

Merge pull request #2656 from hnyman/fwk

fwknop: combine two conffiles sections, remove whitespace
Diffstat:
M
net/fwknop/Makefile
 | 
9
+++------

1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011-2012 OpenWrt.org
+# Copyright (C) 2011-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fwknop
 PKG_VERSION:=2.6.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download
@@ -53,6 +53,7 @@ endef
 define Package/fwknopd/conffiles
 /etc/fwknop/access.conf
 /etc/fwknop/fwknopd.conf
+/etc/config/fwknopd
 endef
 
 define Package/fwknopd/config
@@ -113,10 +114,6 @@ define Package/fwknopd/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fwknopd $(1)/usr/sbin/
 endef
 
-define Package/fwknopd/conffiles
-	/etc/config/fwknopd
-endef
-
 define Package/fwknop/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fwknop $(1)/usr/bin/