Patchwork iptables: correctly reference generated file

login
register
mail settings
Submitter Lutz Jaenicke
Date Aug. 7, 2013, 8:09 a.m.
Message ID <1375862956-22870-1-git-send-email-ljaenicke@innominate.com>
Download mbox | patch
Permalink /patch/265389/
State Accepted
Headers show

Comments

Lutz Jaenicke - Aug. 7, 2013, 8:09 a.m.
Since
  iptables: use autoconf to process .in man pages
the file "iptables-extensions.8.tmpl" is generated from
"iptables-extensions.8.tmpl.in" and is consequently no
longer found in ${srcdir} but in the build directory.
(Becomes visible with builddir != srcdir)

Signed-off-by: Lutz Jaenicke <ljaenicke@innominate.com>
---
 iptables/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Pablo Neira - Aug. 8, 2013, 10:30 a.m.
On Wed, Aug 07, 2013 at 10:09:16AM +0200, Lutz Jaenicke wrote:
> Since
>   iptables: use autoconf to process .in man pages
> the file "iptables-extensions.8.tmpl" is generated from
> "iptables-extensions.8.tmpl.in" and is consequently no
> longer found in ${srcdir} but in the build directory.
> (Becomes visible with builddir != srcdir)

Applied, thanks Lutz.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index 46d2463..501e825 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -38,7 +38,7 @@  if ENABLE_IPV6
 v6_sbin_links  = ip6tables ip6tables-restore ip6tables-save
 endif
 
-iptables-extensions.8: ${srcdir}/iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
+iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man
 	${AM_VERBOSE_GEN} sed \
 		-e '/@MATCH@/ r ../extensions/matches.man' \
 		-e '/@TARGET@/ r ../extensions/targets.man' $< >$@;