From: Phil Oester Date: Mon, 10 Jun 2013 09:35:44 +0000 (-0400) Subject: iptables: Fix connlabel.conf install location X-Git-Tag: v1.4.20~14^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5459339b0cae14b733fef0e52b3c9294deac65e;p=thirdparty%2Fiptables.git iptables: Fix connlabel.conf install location As reported by Danny Rawlins in bug #828, connlabel.conf is unconditionally installed in /etc/xtables instead of using prefix set at configure time. Fix to use sysconfdir variable. This closes bugzilla #828. Signed-off-by: Phil Oester Signed-off-by: Pablo Neira Ayuso --- diff --git a/Makefile.am b/Makefile.am index cd008a19..73f1352c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,8 +25,8 @@ tarball: rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION}; 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 || : + @mkdir -p -m 755 @sysconfdir@/xtables/ || : + @test -f @sysconfdir@/xtables/connlabel.conf || $(INSTALL) -m 644 etc/xtables/connlabel.conf @sysconfdir@/xtables/connlabel.conf || : config.status: extensions/GNUmakefile.in \ include/xtables-version.h.in include/iptables/internal.h.in