wisp
 
(Arne Babenhauserheide)
2017-11-10: fix installing wisp in local datarootdir

fix installing wisp in local datarootdir

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,19 @@
 SUFFIXES = .w .scm .sh
 
-sitedir = $(GUILE_SITE)
-site_DATA = language/wisp.scm
+sitedir = $(datarootdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site
+site_DATA = wisp.scm
 
-langdir = ${datarootdir}/guile/site/$(GUILE_EFFECTIVE_VERSION)/language/wisp
-lang_DATA = language/wisp/spec.scm language/wisp.scm
+langdir = $(datarootdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site/language
+lang_DATA = language/wisp.scm
+
+langwispdir = $(datarootdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site/language/wisp
+langwisp_DATA = language/wisp/spec.scm
 
 WISP = wisp-guile.w wisp-reader.w wisp-scheme.w
 
 EXTRA_DIST = $(WISP) bootstrap.sh bootstrap-reader.sh language examples tests wisp-repl-guile.sh testrunner.w wisp.py wisp.scm m4
 CLEANFILES = 1 2
-DISTCLEANFILES = $(lang_DATA) $(site_DATA)
+DISTCLEANFILES = $(site_DATA) $(lang_DATA) $(langwisp_DATA)
 # don't spout out lots of stuff at each distcheck. Disable for debugging.
 AM_DISTCHECK_CONFIGURE_FLAGS="--quiet"
 
@@ -18,7 +21,7 @@ ChangeLog :
 	hg log --style changelog > ChangeLog
 
 .INTERMEDIATE: .mydatastuff
-$(site_DATA) $(lang_DATA): .wispbootstrap
+$(lang_DATA) $(langwisp_DATA): .wispbootstrap
 .wispbootstrap : ${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
 
@@ -47,10 +50,14 @@ install-siteDATA:
 	echo "Running 'make distcheck'; local installchecks disabled."
 install-langDATA:
 	echo "Running 'make distcheck'; local installchecks disabled."
+install-langwispDATA:
+	echo "Running 'make distcheck'; local installchecks disabled."
 uninstall-siteDATA:
 	echo "Running 'make distcheck'; local installchecks disabled."
 uninstall-langDATA:
 	echo "Running 'make distcheck'; local installchecks disabled."
+uninstall-langwispDATA:
+	echo "Running 'make distcheck'; local installchecks disabled."
 else !IS_MAKE_DISTCHECK
 endif !IS_MAKE_DISTCHECK
 
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ From a release:
 * Get a release from [bitbucket.org/ArneBab/wisp/downloads/](https://bitbucket.org/ArneBab/wisp/downloads/)
 * Unpack and build: `tar xf [release].tar.gz; cd [release]; ./configure; make`
 
-Install systemwide with `./configure --datarootdir=/usr/share && sudo make install`, then you can run `guile --language=wisp` anywhere. Install in your home folder with `./configure --prefix=$HOME/.local; make install`. Use `guile -c '(import (language wisp spec))'` to get rid of auto-compile errors.
+Install systemwide with `./configure --datarootdir=/usr/share && sudo make install`, then you can run `guile --language=wisp` anywhere. Install in your home folder with `./configure --datarootdir=$HOME/.local; make install`. Use `guile -c '(import (language wisp spec))'` to get rid of auto-compile errors.
 
 Run tests with `make check`. Distribute your own version with `make distcheck`.