From: Olaf Hering Subject: [PATCH 27/46] Use configure --includedir=DIR to set INCLUDEDIR Date: Mon, 22 Sep 2014 15:00:16 +0200 Message-ID: <1411390835-7348-28-git-send-email-olaf@aepfle.de> References: <1411390835-7348-1-git-send-email-olaf@aepfle.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1411390835-7348-1-git-send-email-olaf@aepfle.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Olaf Hering , Keir Fraser , David Scott , Stefano Stabellini , George Dunlap , Tim Deegan , Ian Jackson , Jan Beulich , Samuel Thibault , Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Olaf Hering --- 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