From 74d2cdd45a4439744ae5ade7b16c4e8f3b9dbf12 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 13 Nov 2019 09:23:27 +0100
Subject: [PATCH] build: Honor configure's --includedir. Thanks, Vagrant!

Suggested by Vagrant Cascadian

    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902174#84

* build-aux/install.sh.in: Install headers in $includedir.
* configure (includedir): Typo.
* configure.sh (includedir): Likewise.
---
 build-aux/install.sh.in | 4 +++-
 configure               | 2 +-
 configure.sh            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build-aux/install.sh.in b/build-aux/install.sh.in
index 508434e2..03d779e4 100644
--- a/build-aux/install.sh.in
+++ b/build-aux/install.sh.in
@@ -77,11 +77,13 @@ else
     cp $_v ChangeLog ${DESTDIR}${docdir}
 fi
 
+mkdir -p $DESTDIR$includedir
 mkdir -p $DESTDIR$libdir
 mkdir -p $DESTDIR$pkgdatadir
 # rm -f $(find lib -type f -a -executable)
 # rm -f $(find scaffold -type f -a -executable)
-tar -cf- -C ${srcdir} include lib/$mes_cpu-mes | tar -${v}xf- -C $DESTDIR$prefix
+tar -cf- -C ${srcdir}/include . | tar -${v}xf- -C $DESTDIR$includedir
+tar -cf- -C ${srcdir}/lib $mes_cpu-mes | tar -${v}xf- -C $DESTDIR$libdir
 if test -z "$srcdest"; then
     tar -cf- --exclude='*.go' module | tar -${v}xf- -C $DESTDIR$pkgdatadir
 else
diff --git a/configure b/configure
index 1154adea..283e9602 100755
--- a/configure
+++ b/configure
@@ -383,7 +383,7 @@ Some influential environment variables:
          (bindir (option-ref options 'bindir "${prefix}/bin"))
          (datadir (option-ref options 'datadir "${prefix}/share"))
          (docdir (option-ref options 'docdir "${datadir}/doc/mes-${VERSION}"))
-         (includedir (option-ref options 'libdir "${prefix}/include"))
+         (includedir (option-ref options 'includedir "${prefix}/include"))
          (libdir (option-ref options 'libdir "${prefix}/lib"))
          (pkgdatadir (string-append datadir "/mes"))
          (guile-effective-version (effective-version))
diff --git a/configure.sh b/configure.sh
index 4f8b6077..2415edd6 100755
--- a/configure.sh
+++ b/configure.sh
@@ -126,7 +126,7 @@ bindir=$(eval echo ${bindir-$prefix/bin})
 datadir=$(eval echo ${datadir-$prefix/share})
 docdir=$(eval echo ${docdir-$datadir/doc/mes-$VERSION})
 infodir=$(eval echo ${infodir-$datadir/info})
-includedir=$(eval echo ${libdir-$prefix/include})
+includedir=$(eval echo ${includedir-$prefix/include})
 libdir=$(eval echo ${libdir-$prefix/lib})
 pkgdatadir=$(eval echo ${pkgdatadir-$datadir/mes})
 mandir=$(eval echo ${mandir-$datadir/man})