From fb986fa8fe303eaa165ad925dee0fef36650fc0d Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
Date: Tue, 19 Jul 2016 17:10:23 +0200
Subject: [PATCH] build: Define 'pkgmoduledir' in Makefile.am.

---
 Makefile.am  | 1 +
 configure.ac | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 438dcdc..fbaa7dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@
 bin_SCRIPTS = bin/cuirass bin/evaluate
 noinst_SCRIPTS = pre-inst-env
 
+pkgmoduledir=$(datarootdir)/guile/site/2.0/$(PACKAGE)
 dist_pkgmodule_DATA = \
   src/cuirass/base.scm \
   src/cuirass/database.scm \
diff --git a/configure.ac b/configure.ac
index 0428023..6ace1c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,11 +24,6 @@ AS_IF([test -z "$ac_cv_path_GUILD"],
 
 GUILE_MODULE_REQUIRED([sqlite3])
 
-moduledir="${datarootdir}/guile/site/2.0"
-pkgmoduledir="${moduledir}/cuirass"
-AC_SUBST([moduledir])
-AC_SUBST([pkgmoduledir])
-
 AC_CONFIG_FILES([Makefile
                  src/cuirass/config.scm])
 AC_CONFIG_FILES([bin/cuirass], [chmod +x bin/cuirass])