[shepherd] 02/03: build: Install '.go' files under LIBDIR.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository shepherd.

commit 657387546ecf20b28632394be58a4ec43eb08d19
Author: Ludovic Courtès <address@hidden>
Date:   Thu Oct 20 22:44:19 2016 +0200

    build: Install '.go' files under LIBDIR.
    
    * configure.ac: Define and substitute 'guileobjectdir'.
    * Makefile.am (nodist_guileobject_DATA): New variable.
    (nodist_guilemodule_DATA): Remove.
    (nodist_shepherdsub_DATA): Remove 'modules/shepherd/system.scm'.
    (nodist_shepherdgosub_DATA, shepherdgosubdir)
    (scriptsgodir, nodist_scriptsgo_DATA): New variables.
    (nodist_scripts_DATA): Remove.
    (CLEANFILES): Add $(nodist_shepherdgosub_DATA) and
    $(nodist_scriptsgo_DATA).  Remove $(nodist_scripts_DATA).
---
 Makefile.am  |   14 ++++++++++----
 configure.ac |    2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7a88c04..20b7d1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ BUILT_SOURCES = modules/shepherd/config.scm
 # XXX: we can't use 'nobase_' because of the modules/ subdirectory.
 dist_guilemodule_DATA =                                \
   modules/shepherd.scm
-nodist_guilemodule_DATA = $(dist_guilemodule_DATA:%.scm=%.go)
+nodist_guileobject_DATA = $(dist_guilemodule_DATA:%.scm=%.go)
 
 shepherdsubdir = $(guilemoduledir)/shepherd
 dist_shepherdsub_DATA =                                \
@@ -43,8 +43,11 @@ dist_shepherdsub_DATA =                              \
   modules/shepherd/comm.scm
 nodist_shepherdsub_DATA =                      \
   modules/shepherd/config.scm                  \
+  modules/shepherd/system.scm
+
+shepherdgosubdir = $(guileobjectdir)/shepherd
+nodist_shepherdgosub_DATA =                    \
   modules/shepherd/config.go                   \
-  modules/shepherd/system.scm                  \
   modules/shepherd/system.go                   \
   $(dist_shepherdsub_DATA:%.scm=%.go)
 
@@ -53,12 +56,15 @@ dist_scripts_DATA =                         \
   modules/shepherd/scripts/halt.scm            \
   modules/shepherd/scripts/herd.scm            \
   modules/shepherd/scripts/reboot.scm
-nodist_scripts_DATA =                          \
+
+scriptsgodir = $(shepherdgosubdir)/scripts
+nodist_scriptsgo_DATA =                                \
   $(dist_scripts_DATA:%.scm=%.go)
 
 CLEANFILES =                                           \
   $(nodist_guilemodule_DATA) $(nodist_shepherdsub_DATA)        \
-  $(nodist_scripts_DATA)                               \
+  $(nodist_shepherdgosub_DATA)                         \
+  $(nodist_scriptsgo_DATA)                             \
   $(bin_SCRIPTS) $(sbin_SCRIPTS)
 
 # Documentation.
diff --git a/configure.ac b/configure.ac
index 49e245a..3ab863a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,9 @@ dnl Checks for programs.
 GUILE_PROGS
 
 guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION"
+guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"
 AC_SUBST([guilemoduledir])
+AC_SUBST([guileobjectdir])
 
 dnl
 dnl Low-level operating system interface.