Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fwknop: combine two conffiles sections, remove whitespace

Browse source 
fwknop Makefile had two conffiles sections. Combine them.
Remove also the whitespace from conffiles section (see #2652)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2016-05-03 10:56:41 +03:00
parent 5a4ffab87b
commit 000b55d063
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/fwknop/Makefile
View file

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=fwknop PKG_NAME:=fwknop
PKG_VERSION:=2.6.8 PKG_VERSION:=2.6.8
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download PKG_SOURCE_URL:=http://www.cipherdyne.org/fwknop/download
@ -53,6 +53,7 @@ endef
define Package/fwknopd/conffiles define Package/fwknopd/conffiles
/etc/fwknop/access.conf /etc/fwknop/access.conf
/etc/fwknop/fwknopd.conf /etc/fwknop/fwknopd.conf
/etc/config/fwknopd
endef endef
define Package/fwknopd/config define Package/fwknopd/config
@ -113,10 +114,6 @@ define Package/fwknopd/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fwknopd $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fwknopd $(1)/usr/sbin/
endef endef
define Package/fwknopd/conffiles
/etc/config/fwknopd
endef
define Package/fwknop/install define Package/fwknop/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fwknop $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fwknop $(1)/usr/bin/