From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Tue, 18 Nov 2014 07:15:42 +0000 (+0100)
Subject: The "extra" subdirectory for kernel modules may have a full subtree
X-Git-Tag: v6.24~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14268dd62ed9067b687543d586d82501aa3e6fb7;p=ipset

The "extra" subdirectory for kernel modules may have a full subtree

Jesper Dangaard Brouer reported that on Red Hat Enterprise Linux
Server release 6.5 the extra subdirectory contains the full subtree
path

/lib/modules/*/extra/netfilter/ipset/

and not

/lib/modules/*/extra/ipset/

Check only "/extra/" in the path.
---

diff --git a/Makefile.am b/Makefile.am
index 0032ddc..290df8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ modules_install:
 if WITH_KMOD
 	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net \
 			KDIR=$$PWD/kernel modules_install
-	@modinfo ip_set_hash_ip | ${GREP} extra/ipset/ip_set_hash_ip >/dev/null || echo "$$DEPMOD_WARNING"
+	@modinfo ip_set_hash_ip | ${GREP} /extra/ >/dev/null || echo "$$DEPMOD_WARNING"
 else
 	@echo Skipping kernel modules due to --with-kmod=no
 endif