\
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
## 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
(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"
# handle PATH (no clobber)
PATH="${top_builddir}/libguile:${PATH}"
-PATH="${top_builddir}/meta:${PATH}"
+PATH="${top_srcdir}/meta:${PATH}"
export PATH
exec "$@"