From 7aa278e4c474adfac06ddb35584b31534366628f Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Thu, 14 Sep 2017 19:48:03 +0200
Subject: Fix the include guards on the include/libipset/linux_ip_set*.h

The include guards did not prevent including the "same" userspace
and kernel header files.

Fixes bugzilla id #1139, reported and solution suggested by Quentin Armitage.
---
 Makefile.am | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index e3404fa..8d718e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,8 +88,10 @@ endif
 
 update_includes:
 	for x in ip_set.h ip_set_bitmap.h ip_set_hash.h ip_set_list.h; do \
-	    cp kernel/include/uapi/linux/netfilter/ipset/$$x \
-		include/libipset/linux_$$x; \
+	    sed -r -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
+		   -e 's@^#include <linux/netfilter/ipset/ip_set.h>@@' \
+		kernel/include/uapi/linux/netfilter/ipset/$$x \
+		> include/libipset/linux_$$x; \
 	done
 
 update_utils:
-- 
cgit v1.2.3