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 5f2da8b090a37b288951f79cc5d860669c031483..f525ba6b8b19d500d07226719ed5cce955729d62 100644 (file)
--- 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 9e31d519599c188427e915dd0bce5c1ef562d6c3..5cfb0c6c5a92b0bb1511e72dc72f933582940f2c 100644 (file)
--- 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 fe5143f66e7136100cd639ed68d4b3d07cbb0ab6..df4f0922b927a4bc4ef22021e5c797f13630ee96 100644 (file)
--- 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 1f08dfecc26061e97984239088c1fc62f5cfd2d3..d26ea01889a08d6db59423bbe2bd78084e429651 100644 (file)
--- 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>