diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2016-11-12 16:23:00 +0100 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2016-11-12 17:07:57 +0100 |
| commit | 1e5012ca803bbc4e08982f99d6c902e75dcb4421 (patch) | |
| tree | 964c405c40890ff7f9becba420eeb8ad6e5707af /configure.ac | |
| parent | 12d71ee098c3eb84a9a5dc2419bd37a3b9e55dd2 (diff) | |
| download | cuirass-1e5012ca803bbc4e08982f99d6c902e75dcb4421.tar cuirass-1e5012ca803bbc4e08982f99d6c902e75dcb4421.tar.gz | |
build: Let 'make' generate 'src/cuirass/config.scm'.
* Makefile.am (src/cuirass/config.scm, $(go_files)): New targets.
(do_subst, generate_file, go_files): New variables.
(EXTRA_DIST): Distribute 'src/cuirass/config.scm.in'.
(DISTCLEANFILES): Rename to ...
(MOSTLYCLEANFILES): ... this.
* configure.ac (AC_CONFIG_FILES): Remove 'src/cuirass/config.scm'.
(@expanded_datadir@, @expanded_localstatedir@): Delete.
(AC_PROG_MKDIR_P, AC_PROG_SED): Use them.
* src/cuirass/config.scm (%datadir): Set it to $(localstatedir).
(%localstatdir): Set it to $(datadir).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index fb82829..ce246fa 100644 --- a/configure.ac +++ b/configure.ac @@ -8,14 +8,8 @@ AM_INIT_AUTOMAKE([foreign subdir-objects -Wall]) AM_SILENT_RULES([yes]) # enables silent rules by default AC_CANONICAL_HOST - -# Prepare a version of installation directories that does not contain -# references to shell variables. -expanded_prefix="`eval echo $prefix | sed -e "s|NONE|/usr/local|g"`" -AC_SUBST([expanded_datadir], - [`eval echo $datarootdir | sed -e "s|NONE|$expanded_prefix|g"`]) -AC_SUBST([expanded_localstatedir], - [`eval echo $localstatedir | sed -e "s|NONE|$expanded_prefix|g"`]) +AC_PROG_MKDIR_P +AC_PROG_SED PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7]) AC_PATH_PROG([GUILE], [guile]) @@ -27,8 +21,7 @@ GUILE_MODULE_REQUIRED([guix]) GUILE_MODULE_REQUIRED([json]) GUILE_MODULE_REQUIRED([sqlite3]) -AC_CONFIG_FILES([Makefile - src/cuirass/config.scm]) +AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([bin/cuirass], [chmod +x bin/cuirass]) AC_CONFIG_FILES([bin/evaluate], [chmod +x bin/evaluate]) AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], |