artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: configure: Oops, substitute @prefix@.

Browse source 
* build-aux/pre-inst-env.in (MES_PREFIX): Respect pre-set value.
* configure (main): Oops, substitute @prefix@.
* configure.sh (subst): Likewise.
This commit is contained in:
Jan Nieuwenhuizen 2018-08-09 08:58:20 +02:00
parent 1a970bc78d
commit fa3cd8b9a5
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-aux/pre-inst-env.in
View file

@ -23,7 +23,7 @@ abs_top_srcdir="@abs_top_srcdir@"
abs_top_builddir="@abs_top_builddir@" abs_top_builddir="@abs_top_builddir@"
prefix=${prefix-@prefix@} prefix=${prefix-@prefix@}
MES_PREFIX=${srcdest}mes MES_PREFIX=${MES_PREFIX-${srcdest}mes}
export MES_PREFIX export MES_PREFIX
GUILE_LOAD_COMPILED_PATH="$abs_top_builddir/module${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH" GUILE_LOAD_COMPILED_PATH="$abs_top_builddir/module${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"

1
configure vendored
View file

@ -471,6 +471,7 @@ Some influential environment variables:
("@BASH@" . ,(file-name "bash" deps)) ("@BASH@" . ,(file-name "bash" deps))
("@GUILE@" . ,(file-name "guile" deps)) ("@GUILE@" . ,(file-name "guile" deps))
("@MES@" . ,(file-name "guile" deps)) ("@MES@" . ,(file-name "guile" deps))
("@prefix@" . ,prefix)
("@guile_site_dir@" . ,guile-site-dir) ("@guile_site_dir@" . ,guile-site-dir)
("@guile_site_ccache_dir@" . ,guile-site-ccache-dir) ("@guile_site_ccache_dir@" . ,guile-site-ccache-dir)
("@VERSION@" . ,VERSION) ("@VERSION@" . ,VERSION)

1
configure.sh
View file

@ -69,6 +69,7 @@ subst () {
-e s,"@top_builddir@,$top_builddir,"\ -e s,"@top_builddir@,$top_builddir,"\
-e s,"@BASH@,$BASH,"\ -e s,"@BASH@,$BASH,"\
-e s,"@GUILE@,$GUILE,"\ -e s,"@GUILE@,$GUILE,"\
-e s,"@prefix@,$prefix,"\
-e s,"@guile_site_dir@,$guile_site_dir,"\ -e s,"@guile_site_dir@,$guile_site_dir,"\
-e s,"@guile_site_ccache_dir@,$guile_site_ccache_dir,"\ -e s,"@guile_site_ccache_dir@,$guile_site_ccache_dir,"\
-e s,"@VERSION@,$VERSION,"\ -e s,"@VERSION@,$VERSION,"\