commit 6c9230e79339ca ("nftables: rearrange files and examples")
removed the install hook for the old 'iptables table skeleton rulesets'.
This restores the install hook for some of these.
Reported-by: Duncan Roe <duncan_roe@xxxxxxxxxxxxxxx>
Cc: Arturo Borrero Gonzalez <arturo@xxxxxxxxxxxxx>
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
---
Makefile.am | 1 +
configure.ac | 2 ++
files/Makefile.am | 1 +
files/examples/Makefile.am | 18 ++++++++++++++++++
4 files changed, 22 insertions(+)
create mode 100644 files/Makefile.am
create mode 100644 files/examples/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 5ef61be6dfec..f33da9dbd181 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src \
include \
+ files \
doc
EXTRA_DIST = tests \
diff --git a/configure.ac b/configure.ac
index 6c6b9b3a4c4b..fb2175a55656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,6 +119,8 @@ AC_CONFIG_FILES([ \
include/linux/netfilter_ipv4/Makefile \
include/linux/netfilter_ipv6/Makefile \
doc/Makefile \
+ files/Makefile \
+ files/examples/Makefile \
])
AC_OUTPUT
diff --git a/files/Makefile.am b/files/Makefile.am
new file mode 100644
index 000000000000..aee2d7baa2ad
--- /dev/null
+++ b/files/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = examples
diff --git a/files/examples/Makefile.am b/files/examples/Makefile.am
new file mode 100644
index 000000000000..21e8be1bd388
--- /dev/null
+++ b/files/examples/Makefile.am
@@ -0,0 +1,18 @@
+
+pkgsysconfdir = ${sysconfdir}/nftables
+dist_pkgsysconf_DATA = arp-filter.nft \
+ bridge-filter.nft \
+ inet-filter.nft \
+ ipv4-filter.nft \
+ ipv4-mangle.nft \
+ ipv4-nat.nft \
+ ipv4-raw.nft \
+ ipv6-filter.nft \
+ ipv6-mangle.nft \
+ ipv6-nat.nft \
+ ipv6-raw.nft \
+ netdev-ingress.nft
+
+
+install-data-hook:
+ ${SED} -i 's|@sbindir[@]|${sbindir}/|g' ${DESTDIR}${pkgsysconfdir}/*
--
2.16.1
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
