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. --- sly/render/font.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sly/render/font.scm') diff --git a/sly/render/font.scm b/sly/render/font.scm index dace505..433e4bc 100644 --- a/sly/render/font.scm +++ b/sly/render/font.scm @@ -64,7 +64,7 @@ (define* (load-default-font #:optional (point-size 12)) "Load the Sly default TTF font. POINT-SIZE is an optional argument with a default value of 12." - (load-font (string-append %pkgdatadir "/fonts/DejaVuSans.ttf") point-size)) + (load-font (string-append %datadir "/fonts/DejaVuSans.ttf") point-size)) (define (flip-pixels-vertically pixels width height) "Create a new bytevector that reverses the rows in PIXELS, a WIDTH x -- cgit v1.2.3