* fix 'make distcheck' for guile/, require guile version 2.0

guile/Makefile.am

@@ -50,9 +50,11 @@ XFILES=					\
 	mu-guile-msg.x			\
 	mu-guile.x
 
-moduledir=$(GUILE_SITEDIR)
+# FIXME: GUILE_SITEDIR would be better, but that
+# breaks 'make distcheck'
+scmdir=${prefix}/share/guile/site/2.0/
 
-module_DATA=				\
+scm_DATA=				\
 	mu.scm
 
 BUILT_SOURCES=$(XFILES)
@@ -67,5 +69,4 @@ MKDEP = $(CC) -M -MG $(snarfcppopts)
 
 DISTCLEANFILES=$(XFILES)
 
-EXTRA_DIST=$(module_DATA)
-
+EXTRA_DIST=$(scm_DATA)

guile/mu/Makefile.am

@@ -16,12 +16,11 @@
 
 include $(top_srcdir)/gtest.mk
 
-moduledir=$(GUILE_SITEDIR)/mu
-
-module_DATA=		\
+# FIXME: GUILE_SITEDIR would be better, but that
+# breaks 'make distcheck'
+scmdir=${prefix}/share/guile/site/2.0/
+scm_DATA=		\
 	msg.scm		\
 	contact.scm
 
-EXTRA_DIST=$(module_DATA)
-
-
+EXTRA_DIST=$(scm_DATA)