Fix module installation directory.

* src/guile/skribilo/**/Makefile.am (moduledir): New.
  (dist_guilemodule_DATA): Changed to...
  (dist_module_DATA): This.  This fixes module installation.

10 files changed, 20 insertions, 10 deletions

diff --git a/src/guile/skribilo/Makefile.am b/src/guile/skribilo/Makefile.am
index f5b9e2f..c872d64 100644
--- a/src/guile/skribilo/Makefile.am
+++ b/src/guile/skribilo/Makefile.am
@@ -1,4 +1,5 @@
-dist_guilemodule_DATA = biblio.scm color.scm config.scm		\
+moduledir = $(guilemoduledir)/skribilo
+dist_module_DATA =      biblio.scm color.scm config.scm		\
                         debug.scm engine.scm evaluator.scm	\
 			index.scm lib.scm module.scm		\
 		        output.scm prog.scm			\
diff --git a/src/guile/skribilo/biblio/Makefile.am b/src/guile/skribilo/biblio/Makefile.am
index 8d47484..aebc8db 100644
--- a/src/guile/skribilo/biblio/Makefile.am
+++ b/src/guile/skribilo/biblio/Makefile.am
@@ -1,4 +1,5 @@
-dist_guilemodule_DATA = bibtex.scm author.scm abbrev.scm template.scm
+moduledir = $(guilemoduledir)/skribilo/biblio
+dist_module_DATA = bibtex.scm author.scm abbrev.scm template.scm
 
 include $(top_srcdir)/guile-lint.am
 
diff --git a/src/guile/skribilo/engine/Makefile.am b/src/guile/skribilo/engine/Makefile.am
index 0272dee..8983723 100644
--- a/src/guile/skribilo/engine/Makefile.am
+++ b/src/guile/skribilo/engine/Makefile.am
@@ -1,4 +1,5 @@
-dist_guilemodule_DATA = base.scm context.scm html.scm html4.scm	\
+moduledir = $(guilemoduledir)/skribilo/engine
+dist_module_DATA =      base.scm context.scm html.scm html4.scm	\
 			latex.scm lout.scm xml.scm
 
 include $(top_srcdir)/guile-lint.am
diff --git a/src/guile/skribilo/package/Makefile.am b/src/guile/skribilo/package/Makefile.am
index 5ba740c..d6c0a28 100644
--- a/src/guile/skribilo/package/Makefile.am
+++ b/src/guile/skribilo/package/Makefile.am
@@ -1,4 +1,5 @@
-dist_guilemodule_DATA = acmproc.scm french.scm jfp.scm letter.scm	\
+moduledir = $(guilemoduledir)/skribilo/package
+dist_module_DATA =      acmproc.scm french.scm jfp.scm letter.scm	\
 			lncs.scm scribe.scm sigplan.scm			\
 			slide.scm web-article.scm web-book.scm		\
 			eq.scm pie.scm base.scm diff.scm		\
diff --git a/src/guile/skribilo/package/eq/Makefile.am b/src/guile/skribilo/package/eq/Makefile.am
index 0ffbf42..ede4d87 100644
--- a/src/guile/skribilo/package/eq/Makefile.am
+++ b/src/guile/skribilo/package/eq/Makefile.am
@@ -1,4 +1,5 @@
-dist_guilemodule_DATA = lout.scm
+moduledir = $(guilemoduledir)/skribilo/package/eq
+dist_module_DATA = lout.scm
 
 include $(top_srcdir)/guile-lint.am
 
diff --git a/src/guile/skribilo/package/pie/Makefile.am b/src/guile/skribilo/package/pie/Makefile.am
index 49807de..a3f34f4 100644
--- a/src/guile/skribilo/package/pie/Makefile.am
+++ b/src/guile/skribilo/package/pie/Makefile.am
@@ -1,4 +1,5 @@
-dist_guilemodule_DATA = lout.scm
+moduledir = $(guilemoduledir)/skribilo/package/pie
+dist_module_DATA = lout.scm
 
 include $(top_srcdir)/guile-lint.am
 
diff --git a/src/guile/skribilo/package/slide/Makefile.am b/src/guile/skribilo/package/slide/Makefile.am
index 361bb86..1925daf 100644
--- a/src/guile/skribilo/package/slide/Makefile.am
+++ b/src/guile/skribilo/package/slide/Makefile.am
@@ -1,4 +1,5 @@
-dist_guilemodule_DATA = base.scm latex.scm html.scm lout.scm
+moduledir = $(guilemoduledir)/skribilo/package/slide
+dist_module_DATA = base.scm latex.scm html.scm lout.scm
 
 include $(top_srcdir)/guile-lint.am
 
diff --git a/src/guile/skribilo/reader/Makefile.am b/src/guile/skribilo/reader/Makefile.am
index 7603ae5..628a9c4 100644
--- a/src/guile/skribilo/reader/Makefile.am
+++ b/src/guile/skribilo/reader/Makefile.am
@@ -1,3 +1,4 @@
-dist_guilemodule_DATA = skribe.scm outline.scm
+moduledir = $(guilemoduledir)/skribilo/reader
+dist_module_DATA = skribe.scm outline.scm
 
 include $(top_srcdir)/guile-lint.am
diff --git a/src/guile/skribilo/source/Makefile.am b/src/guile/skribilo/source/Makefile.am
index 8baed5e..816a485 100644
--- a/src/guile/skribilo/source/Makefile.am
+++ b/src/guile/skribilo/source/Makefile.am
@@ -1,4 +1,5 @@
-dist_guilemodule_DATA = parameters.scm c.scm lisp.scm xml.scm	\
+moduledir = $(guilemoduledir)/skribilo/source
+dist_module_DATA =      parameters.scm c.scm lisp.scm xml.scm	\
 			lisp-lex.scm xml-lex.scm c-lex.scm
 
 
diff --git a/src/guile/skribilo/utils/Makefile.am b/src/guile/skribilo/utils/Makefile.am
index fd07bbc..bcc54a1 100644
--- a/src/guile/skribilo/utils/Makefile.am
+++ b/src/guile/skribilo/utils/Makefile.am
@@ -1,4 +1,5 @@
-dist_guilemodule_DATA = syntax.scm compat.scm files.scm images.scm	\
+moduledir = $(guilemoduledir)/skribilo/utils
+dist_module_DATA =      syntax.scm compat.scm files.scm images.scm	\
 			keywords.scm strings.scm
 
 include $(top_srcdir)/guile-lint.am