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 0032ddc29b346a3b80b20283179f76fb053bfc42..290df8f34b5c5a37ba363c64ad2617e138bd6d6b 100644 (file)
--- 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