diff options
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | env.in | 14 | ||||
| -rw-r--r-- | guile.am | 2 |
5 files changed, 11 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index 130c9a0..621b6af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SOURCES = \ sly/utils.scm \ sly/agenda.scm \ sly/audio.scm \ - sly/config.scm \ + sly/config.scm \ sly/coroutine.scm \ sly/event.scm \ sly/fps.scm \ @@ -40,8 +40,8 @@ SOURCES = \ sly/math/tween.scm \ sly/math/vector.scm \ sly/repl.scm \ - sly/signal.scm \ - sly/window.scm \ + sly/signal.scm \ + sly/window.scm \ sly/render/utils.scm \ sly/render/color.scm \ sly/render/camera.scm \ @@ -65,10 +65,9 @@ WRAPPER_SOURCES = \ sly/wrappers/gsl.scm \ sly/wrappers/util.scm -sly/config.scm: Makefile - sed -e "s|@pkgdatadir\@|$(pkgdatadir)|" $@.in > $@ - -EXTRA_DIST += env.in +EXTRA_DIST += \ + pre-inst-env.in \ + sandbox.in SUBDIRS = \ data \ diff --git a/configure.ac b/configure.ac index 07e955a..1dfa107 100644 --- a/configure.ac +++ b/configure.ac @@ -8,9 +8,9 @@ AM_SILENT_RULES([yes]) AC_PATH_PROG([GUILE], [guile]) AC_CONFIG_FILES([Makefile doc/Makefile examples/Makefile data/Makefile]) -AC_CONFIG_FILES([env], [chmod +x env]) -AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env]) +AC_CONFIG_FILES([sly/config.scm]) AC_CONFIG_FILES([sandbox], [chmod +x sandbox]) +AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env]) GUILE_PROGS([2.0.11]) GUILE_MODULE_REQUIRED([sdl sdl]) diff --git a/doc/Makefile.am b/doc/Makefile.am index d2b6d5f..4f7d4a2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,3 +10,5 @@ sly_TEXINFOS = \ api/input.texi \ api/rendering.texi \ api/utils.texi + +dvi: # Don't build dvi docs @@ -1,14 +0,0 @@ -#!/bin/sh - -GUILE_LOAD_PATH=@abs_top_srcdir@:$GUILE_LOAD_PATH -if test "@abs_top_srcdir@" != "@abs_top_builddir@"; then - GUILE_LOAD_PATH=@abs_top_builddir@:$GUILE_LOAD_PATH -fi -GUILE_LOAD_COMPILED_PATH=@abs_top_builddir@:$GUILE_LOAD_PATH -PATH=@abs_top_builddir@/bin:$PATH - -export GUILE_LOAD_PATH -export GUILE_LOAD_COMPILED_PATH -export PATH - -exec "$@" @@ -16,4 +16,4 @@ EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat SUFFIXES = .scm .go .scm.go: - $(AM_V_GEN)$(top_builddir)/env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<" + $(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<" |