From 0efff29d495f5bf234d06e4730f1abd78bdb8a1a Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 15 May 2013 23:18:02 +0200 Subject: Revert "extensions: add connlabel match" duplicate 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 | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 931c565f..cd008a19 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 -- cgit v1.2.3