diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2016-12-24 01:08:04 +0100 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2016-12-28 18:19:03 +0100 |
| commit | 57e10c6056458a3456aaa030fe48babc72097ce7 (patch) | |
| tree | bf1fce7daecd7d01d3904b690adfa14b2edddd45 /Makefile.am | |
| parent | 16aec469d45a9339f117cd6427aebe8d7b80e5bc (diff) | |
| download | cuirass-57e10c6056458a3456aaa030fe48babc72097ce7.tar cuirass-57e10c6056458a3456aaa030fe48babc72097ce7.tar.gz | |
build: Set Guile load paths in 'pre-inst-env'.
This reverts most of 4f0d665746e0c6efe43c0f281e0eaac5012c79da. The load paths
are still hard coded after installation, however 'pre-inst-env' wrapper is
used for defining them in the local build environment. This is more
convenient for running the tests manually or launching a Guile REPL with all
the Cuirass modules accessible.
* build-aux/pre-inst-env.in (GUILE_LOAD_PATH, GUILE_LOAD_COMPILED_PATH): New
variables.
* bin/cuirass.in: Comment Guile load paths.
* Makefile.am (local_load_path, local_load_compiled_path): Delete.
(AM_TESTS_ENVIRONMENT): Don't set Guile load paths.
(do_subst): Use install directories for Guile load paths.
(install-exec-hook): Uncomment 'cuirass' hard coded load paths.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 4c562ea..820c749 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,10 +18,6 @@ # You should have received a copy of the GNU General Public License # along with Cuirass. If not, see <http://www.gnu.org/licenses/>. -# Guile local load paths. -local_load_path = $(abs_top_builddir)/src:$(abs_top_srcdir)/src -local_load_compiled_path = $(abs_top_builddir)/src - bin_SCRIPTS = bin/cuirass bin/evaluate noinst_SCRIPTS = pre-inst-env @@ -49,9 +45,7 @@ TEST_EXTENSIONS = .scm .sh AM_TESTS_ENVIRONMENT = \ env GUILE_AUTO_COMPILE='0' \ testsrcdir='$(abs_top_srcdir)/tests' \ - testbuilddir='$(abs_top_builddir)/tests' \ - GUILE_LOAD_PATH="$(local_load_path)$${GUILE_LOAD_PATH:+:}$$GUILE_LOAD_PATH" \ - GUILE_LOAD_COMPILED_PATH="$(local_load_compiled_path)$${GUILE_LOAD_COMPILED_PATH:+:}$$GUILE_LOAD_COMPILED_PATH" + testbuilddir='$(abs_top_builddir)/tests' SCM_LOG_DRIVER = \ $(builddir)/pre-inst-env $(GUILE) \ @@ -139,8 +133,8 @@ do_subst = ( $(SED) \ -e 's,@datadir[@],$(datadir),g' \ -e 's,@GUILE[@],$(GUILE),g' \ -e 's,@localstatedir[@],$(localstatedir),g' \ - -e 's,@PACKAGE_LOAD_COMPILED_PATH[@],$(local_load_compiled_path),g' \ - -e 's,@PACKAGE_LOAD_PATH[@],$(local_load_path),g' \ + -e 's,@PACKAGE_LOAD_COMPILED_PATH[@],$(guilesitedir),g' \ + -e 's,@PACKAGE_LOAD_PATH[@],$(guilesitedir),g' \ | $(SHELL) ./config.status --file=- ) # Generic instructions to perform the substitution. Generated files shouldn't @@ -188,14 +182,10 @@ nobase_dist_pkgdata_DATA = \ ## Installation. ## ## -------------- ## -# Relocate the script---i.e., have them refer to the installed module -# directory. +# Ensure that the scripts will find their module directories. install-exec-hook: $(SED) \ -## XXX: Beware of the order of these two substitutions, because one is a -## substring of the other. - -e 's,$(local_load_path),$(guilesitedir),g' \ - -e 's,$(local_load_compiled_path),$(guilesitedir),g' \ + -e 's,^#GUILE_LOAD,GUILE_LOAD,g' \ -i $(DESTDIR)$(bindir)/cuirass ## -------------- ## |