Install Scheme code in scheme/

configure.in

@@ -59,9 +59,10 @@
 
 
 	#if no_x == 'yes' fail ...
-
+        schemedir="${prefix}/scheme"
         libsysdir="${prefix}/lib/`uname -m`-`uname -s`"
         AC_SUBST(libsysdir)
+        AC_SUBST(schemedir)
 	AC_SUBST(LIBS)
 	AC_SUBST(CC)
 	AC_SUBST(x_includes)

scheme/Makefile.am

@@ -1,5 +1,5 @@
-pkgdata_SCRIPTS=load-scx.scm
+scheme_SCRIPTS=load-scx.scm
-nobase_pkgdata_SCRIPTS= \
+nobase_scheme_SCRIPTS= \
 	examples/hello-xft.scm \
 	examples/hello.scm \
 	examples/picture.scm \
@@ -39,15 +39,15 @@ nobase_pkgdata_SCRIPTS= \
 	xt/widget-type.scm \
 	xt/widget.scm
 
-EXTRA_DIST= $(pkgdata_SCRIPTS) $(nobase_pkgdata_SCRIPTS)
+EXTRA_DIST= $(scheme_SCRIPTS) $(nobase_scheme_SCRIPTS)
 CLEANFILES= load-scx.scm
 
 load-scx.scm: $(srcdir)/load-scx.scm.in
-	sed -e "s|@scxdatadir@|`pwd`/$(srcdir)|g" \
+	sed -e "s|@scxschemedir@|`pwd`/$(srcdir)|g" \
 	    -e "s|@scxlibsysdir@|`pwd`/../c/xlib/.libs|g" $< > $@
 
 install-data-hook:
-	sed -e "s|@scxdatadir@|$(pkgdatadir)|g" \
+	sed -e "s|@scxschemedir@|$(schemedir)|g" \
 	    -e "s|@scxlibsysdir@|$(libsysdir)|g" \
 		$(srcdir)/load-scx.scm.in \
-		> $(DESTDIR)/$(pkgdatadir)/load-scx.scm
+		> $(DESTDIR)/$(schemedir)/load-scx.scm

scheme/load-scx.scm.in

@@ -7,7 +7,7 @@
         (dynamic-load module-file)
         (call-external (get-external initializer-name))))
 (config)
-(load "@scxdatadir@/xlib/xlib-interfaces.scm")
+(load "@scxschemedir@/xlib/xlib-interfaces.scm")
-(load "@scxdatadir@/xlib/xlib-packages.scm")
+(load "@scxschemedir@/xlib/xlib-packages.scm")