some more build fixes for bugs that I introduced

* meta/guile-1.8.pc.in: Include a pkgdatadir, which will map down to
  `guile-config info pkgdatadir', used in existing guile.m4 files.

* meta/guile-config: Fix guile-config info varname. Facepalm.

* meta/guile.m4: Make GUILE_SITE_DIR use the sitedir variable instead.
  Really it should use pkg-config directly, though.

meta/guile-1.8.pc.in

@@ -4,6 +4,7 @@ libdir=@libdir@
 includedir=@includedir@
 datarootdir=@datarootdir@
 datadir=@datadir@
+pkgdatadir=@datadir@/guile
 
 sitedir=@sitedir@
 libguileinterface=@LIBGUILE_INTERFACE@

meta/guile-config

@@ -149,7 +149,8 @@ exec guile -e main -s $0 "$@"
      ((string=? (car args) "guileversion")
       (display (pkg-config "--modversion" guile-module)))
      (else
-      (display (pkg-config (format #f (car args) guile-module))))))
+      (display (pkg-config (format #f "--variable=~A" (car args))
+                           guile-module)))))
    (else (display-line-error "Usage: " program-name " info VAR")
 	 (quit 2))))
 

meta/guile.m4

@@ -107,7 +107,7 @@ AC_DEFUN([GUILE_FLAGS],
 AC_DEFUN([GUILE_SITE_DIR],
  [AC_REQUIRE([GUILE_PROGS])dnl
   AC_MSG_CHECKING(for Guile site directory)
-  GUILE_SITE=`[$GUILE_CONFIG] info pkgdatadir`/site
+  GUILE_SITE=`[$GUILE_CONFIG] info sitedir`/site
   AC_MSG_RESULT($GUILE_SITE)
   AC_SUBST(GUILE_SITE)
  ])