From: Phil Oester <kernel@linuxace.com>
To: netfilter-devel@vger.kernel.org
Cc: pablo@netfilter.org
Subject: [PATCH] iptables: Fix connlabel.conf install location
Date: Mon, 10 Jun 2013 05:35:44 -0400 [thread overview]
Message-ID: <20130610093544.GA31559@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
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.
Phil
Signed-off-by: Phil Oester <kernel@linuxace.com>
[-- Attachment #2: patch-828 --]
[-- Type: text/plain, Size: 675 bytes --]
diff --git a/Makefile.am b/Makefile.am
index cd008a1..73f1352 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
next reply other threads:[~2013-06-11 17:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-10 9:35 Phil Oester [this message]
2013-06-12 7:51 ` [PATCH] iptables: Fix connlabel.conf install location Florian Westphal
2013-06-12 8:50 ` Pablo Neira Ayuso
2013-06-12 9:08 ` Pablo Neira Ayuso
2013-06-12 10:06 ` Florian Westphal
2013-06-25 16:01 ` Pablo Neira Ayuso
2013-06-25 19:52 ` Florian Westphal
2013-07-03 0:13 ` Pablo Neira Ayuso
2013-06-12 8:04 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130610093544.GA31559@gmail.com \
--to=kernel@linuxace.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.