1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00

Fix $(pkgdatadir) & co. so they refer to $(PACKAGE_TARNAME), not $(PACKAGE).

This fixes a regression introduced in
4f02b98d0e ("Use Gnulib's
`version-etc-fsf' for `--version' and `--help' output."), which led
$(pkgdatadir) & co. to contain the string "GNU Guile" instead of
"guile".

* configure.ac (pkgdatadir, pkgincludedir, pkglibdir, pkglibexecdir):
  New variables.
This commit is contained in:
Ludovic Courtès 2009-11-18 12:13:31 +01:00
parent e17b58c22e
commit 53da7372be

View file

@ -1544,9 +1544,20 @@ AC_SUBST(top_builddir_absolute)
top_srcdir_absolute=`(cd $srcdir && pwd)`
AC_SUBST(top_srcdir_absolute)
dnl Override Automake 1.11's broken definitions.
dnl See http://thread.gmane.org/gmane.comp.sysutils.automake.bugs/4803
dnl and info "(automake) Uniform" and info "(autoconf) Initializing configure".
pkgdatadir="$datadir/$PACKAGE_TARNAME"
pkgincludedir="$includedir/$PACKAGE_TARNAME"
pkglibdir="$libdir/$PACKAGE_TARNAME"
pkglibexecdir="$libexecdir/$PACKAGE_TARNAME"
AC_SUBST([pkgdatadir])
AC_SUBST([pkgincludedir])
AC_SUBST([pkglibdir])
AC_SUBST([pkglibexecdir])
dnl We need `sitedir' in `guile-1.8.pc'.
dnl Note: `sitedir' must be kept in sync with `GUILE_SITE_DIR' in `guile.m4'.
pkgdatadir="$datadir/guile"
sitedir="$pkgdatadir/site"
AC_SUBST([sitedir])