[shepherd] 04/06: build: Install Guile modules to the usual place.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository shepherd.

commit 1be92699ea34a271b927afdab6ea19b29f8ab900
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jan 27 10:44:45 2016 +0100

    build: Install Guile modules to the usual place.
    
    * Makefile.am (shepherddir): Remove.
    (dist_shepherd_DATA): Rename to...
    (dist_guilemodule_DATA): ... this.
    (nodist_shepherd_DATA): Rename to...
    (nodist_guilemodule_DATA): ... this.
    * configure.ac: Define and substitute 'guilemoduledir'.
---
 Makefile.am  |   13 ++++++-------
 configure.ac |    3 +++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ecd3cb9..99c20ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,12 +30,11 @@ BUILT_SOURCES = modules/shepherd/config.scm
 
 # The source files.
 # XXX: we can't use 'nobase_' because of the modules/ subdirectory.
-shepherddir = ${datadir}/shepherd
-dist_shepherd_DATA =                           \
+dist_guilemodule_DATA =                                \
   modules/shepherd.scm
-nodist_shepherd_DATA = $(dist_shepherd_DATA:%.scm=%.go)
+nodist_guilemodule_DATA = $(dist_guilemodule_DATA:%.scm=%.go)
 
-shepherdsubdir = $(shepherddir)/shepherd
+shepherdsubdir = $(guilemoduledir)/shepherd
 dist_shepherdsub_DATA =                                \
   modules/shepherd/args.scm                    \
   modules/shepherd/service.scm                 \
@@ -58,7 +57,7 @@ nodist_scripts_DATA =                         \
   $(dist_scripts_DATA:%.scm=%.go)
 
 CLEANFILES =                                           \
-  $(nodist_shepherd_DATA) $(nodist_shepherdsub_DATA)   \
+  $(nodist_guilemodule_DATA) $(nodist_shepherdsub_DATA)        \
   $(nodist_scripts_DATA)                               \
   $(bin_SCRIPTS) $(sbin_SCRIPTS)
 
@@ -83,8 +82,8 @@ install-exec-hook: install-executable-symlinks
           $(bin_SCRIPTS:%=$(DESTDIR)$(bindir)/%)                       \
           $(sbin_SCRIPTS:%=$(DESTDIR)$(sbindir)/%) ;                   \
        do                                                              \
-         $(SED) -e's|$(abs_top_srcdir)/modules|$(shepherddir)|g'       \
-                -e's|$(abs_top_builddir)/modules|$(shepherddir)|g'     \
+         $(SED) -e's|$(abs_top_srcdir)/modules|$(guilemoduledir)|g'    \
+                -e's|$(abs_top_builddir)/modules|$(guilemoduledir)|g'  \
                 -i $$script ;                                          \
        done
 
diff --git a/configure.ac b/configure.ac
index 75ddb30..26ce88a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,9 @@ if test "x$GUILD" = "x"; then
 fi
 AC_SUBST([GUILD])
 
+guilemoduledir="${datarootdir}/guile/site/2.0"
+AC_SUBST([guilemoduledir])
+
 dnl
 dnl Low-level operating system interface.
 dnl