From 5aaf7dcb4da8b0622df8443de833a41afe7c3aca Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 12 Nov 2015 12:16:11 -0500 Subject: config: Fix data directory. This was all messed up: - 'pkgdatadir' wasn't something that could be substituted via autoconf - I was still using "GUILE_2D" in the data dir env var name Now it's all better and Sly data should be able to be found from the pre-installation environment *and* the installation prefix. * configure.ac (sly_prefix, sly_datadir): New variables. * pre-inst-env.in: Set SLY_DATADIR. * sly/config.scm.in (%pkgdatadir): Delete. (%datadir): New variable. Use SLY_DATADIR env var or the configured datadir. * sly/render/font.scm (load-default-font): Use %datadir. * sly/render/shader.scm (load-default-shader): Likewise. --- pre-inst-env.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pre-inst-env.in') diff --git a/pre-inst-env.in b/pre-inst-env.in index e677322..bf3588a 100644 --- a/pre-inst-env.in +++ b/pre-inst-env.in @@ -27,7 +27,7 @@ export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH PATH="$abs_top_builddir:$PATH" export PATH -GUILE_2D_PKGDATADIR="$abs_top_builddir/data" -export GUILE_2D_PKGDATADIR +SLY_DATADIR="$abs_top_builddir/data" +export SLY_DATADIR exec "$@" -- cgit v1.2.3