From 000b55d06353b8339a35fa0ae4a26b3d97eef2e5 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Tue, 3 May 2016 10:56:41 +0300 Subject: [PATCH] fwknop: combine two conffiles sections, remove whitespace fwknop Makefile had two conffiles sections. Combine them. Remove also the whitespace from conffiles section (see #2652) Signed-off-by: Hannu Nyman --- net/fwknop/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/fwknop/Makefile b/net/fwknop/Makefile index a1f994521..ae5f04ac9 100644 --- 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/