diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-06-12 10:01:23 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-06-12 10:01:47 +0200 |
| commit | f1e394be9d08a9e508ceeffca6866627d5ac40f9 (patch) | |
| tree | 86c7bd72e5d2fee3af2db0a6b38e0f3f5f964f24 | |
| parent | 93587a04d0f2511e108bbc4d87a8b9d28a5c5dd8 (diff) | |
| parent | c5459339b0cae14b733fef0e52b3c9294deac65e (diff) | |
Merge branch 'stable'
Get c545933 iptables: Fix connlabel.conf install location
| -rw-r--r-- | Makefile.am | 4 |
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 |