artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Honor configure's --includedir. Thanks, Vagrant!

Browse source 
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.
This commit is contained in:
Jan Nieuwenhuizen 2019-11-13 09:23:27 +01:00
parent 4c862b1cc5
commit 74d2cdd45a
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build-aux/install.sh.in
View file

@ -77,11 +77,13 @@ else
cp $_v ChangeLog ${DESTDIR}${docdir} cp $_v ChangeLog ${DESTDIR}${docdir}
fi fi
mkdir -p $DESTDIR$includedir
mkdir -p $DESTDIR$libdir mkdir -p $DESTDIR$libdir
mkdir -p $DESTDIR$pkgdatadir mkdir -p $DESTDIR$pkgdatadir
# rm -f $(find lib -type f -a -executable) # rm -f $(find lib -type f -a -executable)
# rm -f $(find scaffold -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 if test -z "$srcdest"; then
tar -cf- --exclude='*.go' module | tar -${v}xf- -C $DESTDIR$pkgdatadir tar -cf- --exclude='*.go' module | tar -${v}xf- -C $DESTDIR$pkgdatadir
else else

2
configure vendored
View file

@ -383,7 +383,7 @@ Some influential environment variables:
(bindir (option-ref options 'bindir "${prefix}/bin")) (bindir (option-ref options 'bindir "${prefix}/bin"))
(datadir (option-ref options 'datadir "${prefix}/share")) (datadir (option-ref options 'datadir "${prefix}/share"))
(docdir (option-ref options 'docdir "${datadir}/doc/mes-${VERSION}")) (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")) (libdir (option-ref options 'libdir "${prefix}/lib"))
(pkgdatadir (string-append datadir "/mes")) (pkgdatadir (string-append datadir "/mes"))
(guile-effective-version (effective-version)) (guile-effective-version (effective-version))

2
configure.sh
View file

@ -126,7 +126,7 @@ bindir=$(eval echo ${bindir-$prefix/bin})
datadir=$(eval echo ${datadir-$prefix/share}) datadir=$(eval echo ${datadir-$prefix/share})
docdir=$(eval echo ${docdir-$datadir/doc/mes-$VERSION}) docdir=$(eval echo ${docdir-$datadir/doc/mes-$VERSION})
infodir=$(eval echo ${infodir-$datadir/info}) infodir=$(eval echo ${infodir-$datadir/info})
includedir=$(eval echo ${libdir-$prefix/include}) includedir=$(eval echo ${includedir-$prefix/include})
libdir=$(eval echo ${libdir-$prefix/lib}) libdir=$(eval echo ${libdir-$prefix/lib})
pkgdatadir=$(eval echo ${pkgdatadir-$datadir/mes}) pkgdatadir=$(eval echo ${pkgdatadir-$datadir/mes})
mandir=$(eval echo ${mandir-$datadir/man}) mandir=$(eval echo ${mandir-$datadir/man})