From 28ac76a7e23694462f73e2b7e9e92f21d09902e0 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 12 Nov 2015 15:10:38 -0500 Subject: config: Fix configure script substitution. --- configure.ac | 3 +-- sly/config.scm.in | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 853a051..7708392 100644 --- a/configure.ac +++ b/configure.ac @@ -15,9 +15,8 @@ AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env]) # Prepare a version of $datadir that does not contain references to # shell variables. sly_prefix="`eval echo $prefix | sed -e"s|NONE|/usr/local|g"`" -sly_datadir="`eval eval echo $datadir | sed -e "s|NONE|$guix_prefix|g"`" +sly_datadir="`eval eval echo $datadir | sed -e "s|NONE|$sly_prefix|g"`" AC_SUBST([sly_datadir]) -AC_SUBST([sly_prefix]) GUILE_PROGS([2.0.11]) GUILE_MODULE_REQUIRED([sdl sdl]) diff --git a/sly/config.scm.in b/sly/config.scm.in index 3a455cf..433860d 100644 --- a/sly/config.scm.in +++ b/sly/config.scm.in @@ -27,7 +27,7 @@ %libgslcblas)) (define %datadir - (or (getenv "SLY_DATADIR") "@sly_prefix@@sly_datadir@/sly")) + (or (getenv "SLY_DATADIR") "@sly_datadir@/sly")) (define %libfreeimage "@LIBFREEIMAGE@") -- cgit v1.2.3