From: Arturo Borrero Gonzalez <arturo@netfilter.org>
Date: Tue, 1 May 2018 17:33:45 +0000 (+0200)
Subject: libnftables: fix header export
X-Git-Tag: v0.8.5~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a502ba00e44a03cbce9b5769274e1b604d3f08ad;p=thirdparty%2Fnftables.git

libnftables: fix header export

Instruct Make to actually install the header to the system, otherwise
users won't see the header in their system after running 'make install'.

Also, export main libnftables header with a proper name, since we have another
private header called 'nftables.h' (i.e, let's be concrete with the naming).

Signed-off-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/include/nftables.h b/include/nftables.h
index 5f2da8b0..f525ba6b 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -5,7 +5,7 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <utils.h>
-#include <nftables/nftables.h>
+#include <nftables/libnftables.h>
 
 struct cookie {
 	FILE *fp;
diff --git a/include/nftables/Makefile.am b/include/nftables/Makefile.am
index 9e31d519..5cfb0c6c 100644
--- a/include/nftables/Makefile.am
+++ b/include/nftables/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = nftables.h
+pkginclude_HEADERS = libnftables.h
diff --git a/include/nftables/nftables.h b/include/nftables/libnftables.h
similarity index 100%
rename from include/nftables/nftables.h
rename to include/nftables/libnftables.h
diff --git a/src/libnftables.c b/src/libnftables.c
index fe5143f6..df4f0922 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  *
  */
-#include <nftables/nftables.h>
+#include <nftables/libnftables.h>
 #include <erec.h>
 #include <mnl.h>
 #include <parser.h>
diff --git a/src/main.c b/src/main.c
index 1f08dfec..d26ea018 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,7 +18,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 
-#include <nftables/nftables.h>
+#include <nftables/libnftables.h>
 #include <utils.h>
 #include <cli.h>