From mboxrd@z Thu Jan 1 00:00:00 1970 From: Giorgio Dal Molin Subject: [PATCH 1/1] autotools conversion: added autotools support for the 'files' subdir. Date: Mon, 10 Nov 2014 16:51:08 +0100 Message-ID: <1415634668-11296-2-git-send-email-giorgio.dal.molin@mobotix.com> References: <1415634668-11296-1-git-send-email-giorgio.dal.molin@mobotix.com> Cc: Giorgio To: netfilter-devel@vger.kernel.org Return-path: Received: from mail-in-09.arcor-online.net ([151.189.21.49]:34278 "EHLO mail-in-09.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311AbaKJPvV (ORCPT ); Mon, 10 Nov 2014 10:51:21 -0500 Received: from mail-in-02-z2.arcor-online.net (mail-in-19-z2.arcor-online.net [151.189.8.36]) by mx.arcor.de (Postfix) with ESMTP id 857F4197BD9 for ; Mon, 10 Nov 2014 16:51:19 +0100 (CET) In-Reply-To: <1415634668-11296-1-git-send-email-giorgio.dal.molin@mobotix.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: From: Giorgio --- Makefile.am | 3 ++- configure.ac | 2 ++ files/Makefile.am | 1 + files/nftables/Makefile.am | 13 +++++++++++++ files/nftables/bridge-filter | 2 +- files/nftables/inet-filter | 2 +- files/nftables/ipv4-filter | 2 +- files/nftables/ipv4-mangle | 2 +- files/nftables/ipv4-nat | 2 +- files/nftables/ipv6-filter | 2 +- files/nftables/ipv6-mangle | 2 +- files/nftables/ipv6-nat | 2 +- 12 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 files/Makefile.am create mode 100644 files/nftables/Makefile.am diff --git a/Makefile.am b/Makefile.am index 8d301f6..a3f39ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src \ - include + include \ + files diff --git a/configure.ac b/configure.ac index ddba5e2..4a6f041 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,8 @@ AC_CHECK_FUNCS([memmove memset strchr strdup strerror strtoull]) AC_CONFIG_FILES([ \ Makefile \ src/Makefile \ + files/Makefile \ + files/nftables/Makefile \ include/Makefile \ include/linux/Makefile \ include/linux/netfilter/Makefile \ diff --git a/files/Makefile.am b/files/Makefile.am new file mode 100644 index 0000000..a8394c0 --- /dev/null +++ b/files/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = nftables diff --git a/files/nftables/Makefile.am b/files/nftables/Makefile.am new file mode 100644 index 0000000..1378e2b --- /dev/null +++ b/files/nftables/Makefile.am @@ -0,0 +1,13 @@ + +pkgsysconfdir = ${sysconfdir}/nftables +dist_pkgsysconf_DATA = bridge-filter \ + inet-filter \ + ipv4-filter \ + ipv4-mangle \ + ipv4-nat \ + ipv6-filter \ + ipv6-mangle \ + ipv6-nat + +install-data-hook: + ${SED} -i 's|@sbindir[@]|${sbindir}/|g' ${DESTDIR}${pkgsysconfdir}/* diff --git a/files/nftables/bridge-filter b/files/nftables/bridge-filter index 54779c4..2add455 100644 --- a/files/nftables/bridge-filter +++ b/files/nftables/bridge-filter @@ -1,4 +1,4 @@ -#! nft -f +#! @sbindir@nft -f table bridge filter { chain input { type filter hook input priority -200; } diff --git a/files/nftables/inet-filter b/files/nftables/inet-filter index 9f3108f..f572db5 100644 --- a/files/nftables/inet-filter +++ b/files/nftables/inet-filter @@ -1,4 +1,4 @@ -#! nft -f +#! @sbindir@nft -f table inet filter { chain input { type filter hook input priority 0; } diff --git a/files/nftables/ipv4-filter b/files/nftables/ipv4-filter index 3174e7a..a4ca7f2 100644 --- a/files/nftables/ipv4-filter +++ b/files/nftables/ipv4-filter @@ -1,4 +1,4 @@ -#! nft -f +#! @sbindir@nft -f table filter { chain input { type filter hook input priority 0; } diff --git a/files/nftables/ipv4-mangle b/files/nftables/ipv4-mangle index 27327d3..be564a5 100644 --- a/files/nftables/ipv4-mangle +++ b/files/nftables/ipv4-mangle @@ -1,4 +1,4 @@ -#! nft -f +#! @sbindir@nft -f table mangle { chain output { type route hook output priority -150; } diff --git a/files/nftables/ipv4-nat b/files/nftables/ipv4-nat index 99d6951..01c6c3d 100644 --- a/files/nftables/ipv4-nat +++ b/files/nftables/ipv4-nat @@ -1,4 +1,4 @@ -#! nft -f +#! @sbindir@nft -f table nat { chain prerouting { type nat hook prerouting priority -150; } diff --git a/files/nftables/ipv6-filter b/files/nftables/ipv6-filter index 98fce02..ce4d7de 100644 --- a/files/nftables/ipv6-filter +++ b/files/nftables/ipv6-filter @@ -1,4 +1,4 @@ -#! nft -f +#! @sbindir@nft -f table ip6 filter { chain input { type filter hook input priority 0; } diff --git a/files/nftables/ipv6-mangle b/files/nftables/ipv6-mangle index 7274353..fa32402 100644 --- a/files/nftables/ipv6-mangle +++ b/files/nftables/ipv6-mangle @@ -1,4 +1,4 @@ -#! nft -f +#! @sbindir@nft -f table ip6 mangle { chain output { type route hook output priority -150; } diff --git a/files/nftables/ipv6-nat b/files/nftables/ipv6-nat index 33ecf9b..3f57c56 100644 --- a/files/nftables/ipv6-nat +++ b/files/nftables/ipv6-nat @@ -1,4 +1,4 @@ -#! nft -f +#! @sbindir@nft -f table ip6 nat { chain prerouting { type nat hook prerouting priority -150; } -- 2.1.3