[packages_10.03.2] xtables-addons: merge r29345, r29644, r29988

[10.03/packages.git] / net / xtables-addons / patches / 001-no_depmod.patch

diff --git a/net/xtables-addons/patches/001-no_depmod.patch b/net/xtables-addons/patches/001-no_depmod.patch
index 9a99389..9905af1 100644 (file)
--- a/net/xtables-addons/patches/001-no_depmod.patch
+++ b/net/xtables-addons/patches/001-no_depmod.patch
@@ -2,23 +2,15 @@
  Makefile.in |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -754,8 +754,7 @@ install-dvi: install-dvi-recursive
- install-dvi-am:
- 
- install-exec-am:
--      @$(NORMAL_INSTALL)
--      $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-+
- install-html: install-html-recursive
- 
- install-html-am:
-@@ -827,7 +826,6 @@ xtables-addons.8: FORCE
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,9 +11,6 @@ FORCE:
+ xtables-addons.8: FORCE
        ${MAKE} -f Makefile.mans all;
  
- install-exec-hook:
+-install-exec-hook:
 -      depmod -a || :;
- 
+-
  config.status: Makefile.iptrules.in
  
+ tmpdir := $(shell mktemp -dtu)