Install headers in ${includedir}/libnl3

This allows for multiple major versions to be installed in parallel. Pkg-config
files are adapted to provide appropriate cflags to find new header locations.

diff --git a/include/Makefile.am b/include/Makefile.am
index e9fa8ad28bc65b3f2c44cf630871038d3f99de09..fa8e9b36848beb9fbea0194ee5947f7e27fb22e5 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,6 +1,8 @@
 # -*- Makefile -*-
 
-nobase_include_HEADERS = \
+libnlincludedir = $(includedir)/libnl@MAJ_VERSION@
+
+nobase_libnlinclude_HEADERS = \
        netlink/cli/addr.h \
        netlink/cli/class.h \
        netlink/cli/cls.h \

diff --git a/libnl-3.pc.in b/libnl-3.pc.in
index e44f0fbe487e18afc2b6b2f8395650be49eb30ff..05a06fc4728272d7a1fc5ef4d609e00501227e1a 100644 (file)
--- a/libnl-3.pc.in
+++ b/libnl-3.pc.in
@@ -7,4 +7,4 @@ Name: libnl
 Description: Convenience library for netlink sockets
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lnl
-Cflags: -I${includedir}
+Cflags: -I${includedir}/libnl@MAJ_VERSION@

diff --git a/libnl-genl-3.pc.in b/libnl-genl-3.pc.in
index 216755942cda910cd755cefffacf30c4e705b94a..e9cbe62e5bd224eaa63e4c3445474d518ad9ca86 100644 (file)
--- a/libnl-genl-3.pc.in
+++ b/libnl-genl-3.pc.in
@@ -8,4 +8,4 @@ Description: Generic Netlink Library
 Version: @PACKAGE_VERSION@
 Requires: libnl-3
 Libs: -L${libdir} -lnl-genl
-Cflags: -I${includedir}
+Cflags: -I${includedir}/libnl@MAJ_VERSION@

diff --git a/libnl-nf-3.pc.in b/libnl-nf-3.pc.in
index 0ec9100796467b9b85973b6519f295ee23f20fe5..b45eb51a91a8c4ee484a12c65befed6566ddd983 100644 (file)
--- a/libnl-nf-3.pc.in
+++ b/libnl-nf-3.pc.in
@@ -8,4 +8,4 @@ Description: Netfilter Netlink Library
 Version: @PACKAGE_VERSION@
 Requires: libnl-3
 Libs: -L${libdir} -lnl-nf
-Cflags: -I${includedir}
+Cflags: -I${includedir}/libnl@MAJ_VERSION@

diff --git a/libnl-route-3.pc.in b/libnl-route-3.pc.in
index 217f6c28e1dd537962ca4e54a6f089da62c4d01e..498861687c0d106b059e97f322255dd4e784caec 100644 (file)
--- a/libnl-route-3.pc.in
+++ b/libnl-route-3.pc.in
@@ -8,4 +8,4 @@ Description: Netlink Routing Family Library
 Version: @PACKAGE_VERSION@
 Requires: libnl-3
 Libs: -L${libdir} -lnl-route
-Cflags: -I${includedir}
+Cflags: -I${includedir}/libnl@MAJ_VERSION@