]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
Revert "extensions: add connlabel match" duplicate
authorFlorian Westphal <fw@strlen.de>
Wed, 15 May 2013 21:18:02 +0000 (23:18 +0200)
committerFlorian Westphal <fw@strlen.de>
Wed, 15 May 2013 21:18:02 +0000 (23:18 +0200)
This reverts commit ca376fcbe51b9a102a490545957d5fee69e253e1
to get rid of the duplicated install-data-hook.

This should get the tree back into the right state.

Conflicts:
Makefile.am

Makefile.am

index 931c565f77f3aa877004fc722c5fdbcd73674f57..cd008a1930dcd3dc693a2e9851a02c53da736775 100644 (file)
@@ -28,9 +28,5 @@ install-data-hook:
        @mkdir -p -m 755 $(DESTDIR)/etc/xtables/ || :
        @test -f /etc/xtables/connlabel.conf || $(INSTALL) -m 644 etc/xtables/connlabel.conf $(DESTDIR)/etc/xtables/connlabel.conf || :
 
-install-data-hook:
-       @mkdir -p -m 755 $(DESTDIR)/etc/xtables/ || :
-       @test -f /etc/xtables/connlabel.conf || $(INSTALL) -m 644 etc/xtables/connlabel.conf $(DESTDIR)/etc/xtables/connlabel.conf || :
-
 config.status: extensions/GNUmakefile.in \
        include/xtables-version.h.in include/iptables/internal.h.in