[Xen-devel] [PATCH 27/46] Use configure --includedir=DIR to set INCLUDEDIR

[Olaf Hering <olaf@xxxxxxxxx>]

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
 config/Paths.mk.in | 1 +
 config/StdGNU.mk   | 1 -
 config/SunOS.mk    | 1 -
 m4/paths.m4        | 3 +++
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/Paths.mk.in b/config/Paths.mk.in
index d369944..4b6ac36 100644
--- a/config/Paths.mk.in
+++ b/config/Paths.mk.in
@@ -16,6 +16,7 @@ SBINDIR                  := @SBINDIR@
 BINDIR                   := @BINDIR@
 LIBEXEC                  := @LIBEXEC@
 
+INCLUDEDIR               := @INCLUDEDIR@
 SHAREDIR                 := @SHAREDIR@
 MANDIR                   := @MANDIR@
 DOCDIR                   := @DOCDIR@
diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index d6175c0..f2c3dfa 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -28,7 +28,6 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
-INCLUDEDIR = $(PREFIX)/include
 MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
 
diff --git a/config/SunOS.mk b/config/SunOS.mk
index 94103fc..4b08fee 100644
--- a/config/SunOS.mk
+++ b/config/SunOS.mk
@@ -20,7 +20,6 @@ INSTALL_DATA = $(INSTALL) -m0644 -p
 INSTALL_PROG = $(INSTALL) -m0755 -p
 
 PREFIX ?= /usr
-INCLUDEDIR = $(PREFIX)/include
 MAN1DIR = $(MANDIR)/man1
 MAN8DIR = $(MANDIR)/man8
 
diff --git a/m4/paths.m4 b/m4/paths.m4
index b36a336..9b3dc59 100644
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -45,6 +45,9 @@ AC_SUBST(BINDIR)
 SBINDIR=$prefix/sbin
 AC_SUBST(SBINDIR)
 
+INCLUDEDIR=`eval echo $includedir`
+AC_SUBST(INCLUDEDIR)
+
 dnl XXX: this should be changed to use the passed $libexec
 dnl but can be done as a second step
 case "$host_os" in

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel