From d4876cb4133625d1cdddf044a1b434e292ee82d7 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@oblong.net>
Date: Tue, 21 Apr 2009 12:41:19 +0200
Subject: [PATCH] distcheck fixen

* examples/Makefile.am: Fix the installed guile-config invocation to set
  PKG_CONFIG_PATH.

* meta/Makefile.am (EXTRA_DIST): Dist the bin_SCRIPTS.

* meta/guile-config (pkg-config): Better error messages if pkg-config
  invocation fails.

* meta/uninstalled-env.in (PATH): Now that guile-config and guile-tools
  are not generated, make it the srcdir/meta instead of the builddir.
  (Guile itself will be picked up from libguile.)
---
 examples/Makefile.am    | 4 ++--
 meta/Makefile.am        | 3 ++-
 meta/guile-config       | 6 +++++-
 meta/uninstalled-env.in | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1b995b521..873f34ce0 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -38,8 +38,8 @@ EXTRA_DIST = README ChangeLog-2008 check.test				\
 									\
  safe/README safe/safe safe/untrusted.scm safe/evil.scm
 
-AM_CFLAGS = `$(bindir)/guile-config compile`
-AM_LIBS   = `$(bindir)/guile-config link`
+AM_CFLAGS = `PKG_CONFIG_PATH=$(libdir)/pkgconfig $(bindir)/guile-config compile`
+AM_LIBS   = `PKG_CONFIG_PATH=$(libdir)/pkgconfig $(bindir)/guile-config link`
 
 
 box/box: box/box.o
diff --git a/meta/Makefile.am b/meta/Makefile.am
index 6614ab349..7f655e535 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -21,7 +21,8 @@
 ##   Floor, Boston, MA 02110-1301 USA
 
 bin_SCRIPTS=guile-config guile-tools
-EXTRA_DIST=guile.m4 ChangeLog-2008 \
+EXTRA_DIST= $(bin_SCRIPTS) \
+	guile.m4 ChangeLog-2008 \
 	guile-1.8.pc.in guile-1.8-uninstalled.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/meta/guile-config b/meta/guile-config
index b90a5e599..815414a38 100755
--- a/meta/guile-config
+++ b/meta/guile-config
@@ -79,7 +79,11 @@ exec guile -e main -s $0 "$@"
          (ret (close-pipe pipe)))
     (case (status:exit-val ret)
       ((0) (if (eof-object? output) "" output))
-      (else (error "error calling pkg-config: ~A" output)))))
+      (else (display-line-error
+             (format #f "error: ~s exited with non-zero error code ~A"
+                     (cons "pkg-config" args) (status:exit-val ret)))
+            ;; assume pkg-config sent diagnostics to stdout
+            (exit (status:exit-val ret))))))
 
 (define (show-version args)
   (format (current-error-port) "~A - Guile version ~A"
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 56bbc307f..d5c7949f5 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -93,7 +93,7 @@ export PKG_CONFIG_PATH
 
 # handle PATH (no clobber)
 PATH="${top_builddir}/libguile:${PATH}"
-PATH="${top_builddir}/meta:${PATH}"
+PATH="${top_srcdir}/meta:${PATH}"
 export PATH
 
 exec "$@"