diff options
| author | David Thompson <dthompson2@worcester.edu> | 2017-08-08 18:21:08 -0400 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2017-09-13 21:16:30 -0400 |
| commit | e2e9ff8b52e406370b9ba0bc9a19cc81cf46b2b9 (patch) | |
| tree | 77e69063f3aba9d40c5b8755423b759a6e796723 | |
| parent | 69d613380e358b0ee30e1925eae8f54eed60a825 (diff) | |
Fix datadir.
| -rw-r--r-- | chickadee/config.scm.in | 6 | ||||
| -rw-r--r-- | pre-inst-env.in | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chickadee/config.scm.in b/chickadee/config.scm.in index 86aaeb5..6ff5a83 100644 --- a/chickadee/config.scm.in +++ b/chickadee/config.scm.in @@ -23,14 +23,14 @@ (define-module (chickadee config) #:export (%datadir - %sly-version + %chickadee-version scope-datadir)) (define %datadir - (or (getenv "SLY_DATADIR") "@chickadee_datadir@/chickadee")) + (or (getenv "CHICKADEE_DATADIR") "@chickadee_datadir@/chickadee")) (define %chickadee-version "@PACKAGE_VERSION@") (define (scope-datadir file) "Append the Chickadee data directory to FILE." - (string-append %datadir file)) + (string-append %datadir "/" file)) diff --git a/pre-inst-env.in b/pre-inst-env.in index d06155f..140fa89 100644 --- a/pre-inst-env.in +++ b/pre-inst-env.in @@ -26,7 +26,7 @@ export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH PATH="$abs_top_builddir/scripts:$PATH" export PATH -CHICKADEE_DATADIR="$abs_top_builddir/assets" +CHICKADEE_DATADIR="$abs_top_builddir/data" export CHICKADEE_DATADIR exec "$@" |