From a56a0ec33c367bc45c5adea83c95e74a080a89ab Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Mon, 3 Dec 2007 09:17:21 +0100
Subject: configure: Have `guilemoduledir' default to
 `$pkgdatadir/$PACKAGE_VERSION'.

* configure.ac: Change default value of `guilemoduledir'.
---
 configure.ac | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index dcb74cf..6d1230a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,15 +60,16 @@ AM_CONDITIONAL([HAVE_PLOTICUS], [test "x$PLOTICUS" != "x"])
 
 pkgdatadir="$datadir/$PACKAGE_NAME"
 if test "x$guilemoduledir" = "x"; then
-  guilemoduledir="$pkgdatadir"
+  guilemoduledir="$pkgdatadir/$PACKAGE_VERSION"
 fi
 AC_SUBST([guilemoduledir])
 
 if test "$guilemoduledir" != "$GUILE_SITE"; then
    # Guile won't be able to locate the module "out of the box", so
-   # warn the user.
+   # warn the user.  OTOH, `skribilo' will find it, no matter where
+   # it is.
    AC_MSG_WARN([`guilemoduledir' ($guilemoduledir) is different from `GUILE_SITE' ($GUILE_SITE).])
-   AC_MSG_WARN([Make sure to adjust the `GUILE_LOAD_PATH' environment variable accordingly,])
+   AC_MSG_WARN([You might want to adjust the `GUILE_LOAD_PATH' environment variable accordingly,])
    AC_MSG_WARN([or re-run `configure' with `--with-guilemoduledir=$GUILE_SITE'.])
 fi
 
-- 
cgit v1.2.3