summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Oester <kernel@linuxace.com>2013-06-10 05:35:44 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2013-06-12 10:00:54 +0200
commitc5459339b0cae14b733fef0e52b3c9294deac65e (patch)
tree197ae0e9e214e00906adb33221c913f7d63626d8
parent96c42d4c46df3edbd41fa47b860fba217f03cfeb (diff)
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 <kernel@linuxace.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
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