2016-02-01: Have "make install" add the language to Guile

Have "make install" add the language to Guile * install wisp-scheme.scm and language/wisp/spec.scm

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,22 @@
-wisp = wisp-scheme.scm language/wisp/spec.scm
-wisp_SOURCES = wisp-guile.w wisp-reader.w wisp-scheme.w
-EXTRA_DIST = $(wisp_SOURCES) $(wisp_DATA) bootstrap.sh bootstrap-reader.sh examples tests wisp-repl-guile.sh testrunner.w wisp.py wisp.scm
-CLEANFILES = ${wisp} ChangeLog
+SUFFICES = .w .scm .sh
+
+sitedir = $(GUILE_SITE)
+site_DATA = wisp-scheme.scm
+
+langdir = ${datarootdir}/guile/$(GUILE_EFFECTIVE_VERSION)/language/wisp
+lang_DATA = language/wisp/spec.scm
+
+WISP = wisp-guile.w wisp-reader.w wisp-scheme.w
+
+EXTRA_DIST = $(WISP) bootstrap.sh bootstrap-reader.sh examples tests wisp-repl-guile.sh testrunner.w wisp.py wisp.scm
 DISTCLEANFILES = ${CLEANFILES} @abs_top_builddir@/1 @abs_top_builddir@/2 @abs_top_builddir@/syntaxtests.sh @abs_top_builddir@/syntaxtestsreader.sh
 # don't spout out lots of stuff at each distcheck. Disable for debugging.
 AM_DISTCHECK_CONFIGURE_FLAGS="--quiet"
 
-
-all : ${wisp}
-
 ChangeLog :
 	hg log --style changelog > ChangeLog
 
-# emacs org-mode beamer build instructions
-${wisp} : input.in.intermediate
-
-.INTERMEDIATE: input.in.intermediate
-input.in.intermediate: ${wisp_SOURCES} wisp.scm
+$(site_DATA) $(lang_DATA): ${WISP} wisp.scm
 	@abs_top_srcdir@/bootstrap-reader.sh @abs_top_srcdir@ @abs_top_builddir@ @GUILE@ wisp.scm 2>&1 | sed "s/^;;;.*//" 2>&1 | grep . 1>&2 ; test ! $$? -eq 0 # it worked if grep does not find anything
 
 wisp.scm: wisp-guile.w wisp.py
@@ -29,7 +29,7 @@ syntaxtests.sh : wisp.scm tests/runtests
 	chmod +x @abs_top_builddir@/$@
 
 .PHONY: syntaxtestsreader.sh
-syntaxtestsreader.sh : ${wisp} wisp.scm tests/runtests-scheme-reader.sh
+syntaxtestsreader.sh : ${WISP} wisp.scm tests/runtests-scheme-reader.sh
 	echo '#!/usr/bin/env bash' > @abs_top_builddir@/$@
 	echo @abs_top_srcdir@/tests/runtests-scheme-reader.sh @abs_top_srcdir@ @abs_top_builddir@ >> @abs_top_builddir@/$@
 	chmod +x @abs_top_builddir@/$@
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,12 @@ AC_CANONICAL_TARGET
 # search for Guile using the guile m4 files.
 # see https://www.gnu.org/software/guile/manual/html_node/Autoconf-Macros.html
 # This provides @GUILE@ to Makefile.am
-GUILE_PROGS([2.0.11])
+PKG_CHECK_MODULES(GUILE, guile-2.0 >= 2.0.11)
+GUILE_PROGS
+GUILE_SITE_DIR
+
+dnl set installation prefix for languge files to Guile location
+AC_PREFIX_PROGRAM([guile])
 
 AC_ARG_VAR([python3], [How to call Python 3.])
 AC_CHECK_TARGET_TOOL([python3], [python3], [no])