build-aux/pre-inst-env.in (GUILE_LOAD_PATH): Add "abs_top_srcdir"

artyom-poptsov · artyom-poptsov · commit ee261f37b9e5 · 2024-03-24T09:52:09.000+03:00
* build-aux/pre-inst-env.in (GUILE_LOAD_PATH): Add modules from the absolute
  top source directory to the path.
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in
@@ -2,7 +2,7 @@
 
 ## Guile-SMC -- A State-Machine Compiler.
 
-# Copyright (C) 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+# Copyright (C) 2022-2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 #
 # This file is part of Guile-SMC.
 #
@@ -36,7 +36,7 @@ abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd -P`"
 abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd -P`"
 
 GUILE_LOAD_COMPILED_PATH="$abs_top_builddir${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
-GUILE_LOAD_PATH="$abs_top_builddir/modules/:$abs_top_srcdir${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH"
+GUILE_LOAD_PATH="$abs_top_builddir/modules/:$abs_top_srcdir/modules/:$abs_top_srcdir${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH"
 export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
 
 PATH="$abs_top_builddir/scripts:$abs_top_builddir:$PATH"

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`## Guile-SMC -- A State-Machine Compiler.`
`4`	`4`
`5`		`-# Copyright (C) 2022 Artyom V. Poptsov <[email protected]>`
	`5`	`+# Copyright (C) 2022-2024 Artyom V. Poptsov <[email protected]>`
`6`	`6`	`#`
`7`	`7`	`# This file is part of Guile-SMC.`
`8`	`8`	`#`
@@ -36,7 +36,7 @@ abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd -P`"
`36`	`36`	abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd -P`"
`37`	`37`
`38`	`38`	`GUILE_LOAD_COMPILED_PATH="$abs_top_builddir${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"`
`39`		`-GUILE_LOAD_PATH="$abs_top_builddir/modules/:$abs_top_srcdir${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH"`
	`39`	`+GUILE_LOAD_PATH="$abs_top_builddir/modules/:$abs_top_srcdir/modules/:$abs_top_srcdir${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH"`
`40`	`40`	`export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH`
`41`	`41`
`42`	`42`	`PATH="$abs_top_builddir/scripts:$abs_top_builddir:$PATH"`