From 226b387557b402843d4fc17b1e62c69138549459 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Tue, 13 Sep 2011 11:48:18 +0200 Subject: [PATCH] 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. --- include/Makefile.am | 4 +++- libnl-3.pc.in | 2 +- libnl-genl-3.pc.in | 2 +- libnl-nf-3.pc.in | 2 +- libnl-route-3.pc.in | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/Makefile.am b/include/Makefile.am index e9fa8ad..fa8e9b3 100644 --- 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 e44f0fb..05a06fc 100644 --- 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 2167559..e9cbe62 100644 --- 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 0ec9100..b45eb51 100644 --- 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 217f6c2..4988616 100644 --- 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@