diff options
| author | David Thompson <dthompson2@worcester.edu> | 2015-11-12 12:16:11 -0500 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2015-11-12 12:16:11 -0500 |
| commit | 5aaf7dcb4da8b0622df8443de833a41afe7c3aca (patch) | |
| tree | f0cfaea1ccf3158f7f12175f22f9c7e3cc100961 /pre-inst-env.in | |
| parent | efbd5d797af6ca36a61f225dc02ade47e8dfd175 (diff) | |
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.
Diffstat (limited to 'pre-inst-env.in')
| -rw-r--r-- | pre-inst-env.in | 4 |
1 files changed, 2 insertions, 2 deletions
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 "$@" |