From: Jan Engelhardt <jengelh@medozas.de>
Date: Mon, 12 May 2008 08:28:34 +0000 (+0200)
Subject: iptables out-of-tree build directory
X-Git-Tag: v1.4.1-rc1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac21a5cb811dad7928c34534cae24427068dd440;p=thirdparty%2Fiptables.git

iptables out-of-tree build directory

Reported by: Henrik Nordstrom

When xtables.h is not already found in /usr/include, compilation
would fail when ${top_srcdir} != ${top_builddir}.
---

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 31e6fb77..9c46ab10 100644
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -1,5 +1,7 @@
 # -*- Makefile -*-
 
+top_builddir := @top_builddir@
+builddir     := @builddir@
 top_srcdir  := @top_srcdir@
 srcdir      := @srcdir@
 ksourcedir  := @ksourcedir@
@@ -16,7 +18,7 @@ LDFLAGS        := @LDFLAGS@
 regular_CFLAGS := @regular_CFLAGS@
 kinclude_CFLAGS := @kinclude_CFLAGS@
 
-AM_CFLAGS      := ${regular_CFLAGS} -I${top_srcdir}/include ${kinclude_CFLAGS}
+AM_CFLAGS      := ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CFLAGS}
 AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
 
 ifeq (${V},)