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.

1 files changed, 4 insertions, 4 deletions

diff --git a/sly/config.scm.in b/sly/config.scm.in
index 012483e..3a455cf 100644
--- a/sly/config.scm.in
+++ b/sly/config.scm.in
@@ -1,5 +1,5 @@
 ;;; Sly
-;;; Copyright (C) 2014 David Thompson <dthompson2@worcester.edu>
+;;; Copyright (C) 2014, 2015 David Thompson <dthompson2@worcester.edu>
 ;;;
 ;;; Sly is free software: you can redistribute it and/or modify it
 ;;; under the terms of the GNU Lesser General Public License as
@@ -22,12 +22,12 @@
 ;;; Code:
 
 (define-module (sly config)
-  #:export (%pkgdatadir
+  #:export (%datadir
             %libfreeimage
             %libgslcblas))
 
-(define %pkgdatadir
-  (or (getenv "GUILE_2D_PKGDATADIR") "@pkgdatadir@"))
+(define %datadir
+  (or (getenv "SLY_DATADIR") "@sly_prefix@@sly_datadir@/sly"))
 
 (define %libfreeimage
   "@LIBFREEIMAGE@")