xtables-addons: Automatically detect location of kernel source

[ipfire-2.x.git] / lfs / xtables-addons

diff --git a/lfs/xtables-addons b/lfs/xtables-addons
index da67aa761e84a6e224289451cc745f4e402fb559..162ef87d8c82eb764d740c4f2323feeaa4fd8c0e 100644 (file)
--- a/lfs/xtables-addons
+++ b/lfs/xtables-addons
@@ -82,6 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xtables-addons-3.2-fix-database-generation.patch
+
        # Only build the specified modules.
        cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \
                $(DIR_APP)/mconfig
@@ -96,12 +98,10 @@ ifeq "$(USPACE)" "1"
        cd $(DIR_APP) && make install
 
        # Install xt_geoip_build.
-       cd $(DIR_APP) && install -m 755 GeoIP/xt_geoip_build \
+       cd $(DIR_APP) && install -m 755 geoip/xt_geoip_build \
                /usr/local/bin/
 else
-       cd $(DIR_APP) && ./configure \
-               --with-kbuild=/usr/src/linux-$(KVER)/
-
+       cd $(DIR_APP) && ./configure
        cd $(DIR_APP) && make $(MAKETUNING)
 
        # Install the built kernel modules.