mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

distcheck fixen

Browse source 
* 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.)
This commit is contained in:
Andy Wingo 2009-04-21 12:41:19 +02:00
parent 71d903c881
commit d4876cb413
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/Makefile.am
View file

@ -38,8 +38,8 @@ EXTRA_DIST = README ChangeLog-2008 check.test \
\ \
safe/README safe/safe safe/untrusted.scm safe/evil.scm safe/README safe/safe safe/untrusted.scm safe/evil.scm
AM_CFLAGS = `$(bindir)/guile-config compile` AM_CFLAGS = `PKG_CONFIG_PATH=$(libdir)/pkgconfig $(bindir)/guile-config compile`
AM_LIBS = `$(bindir)/guile-config link` AM_LIBS = `PKG_CONFIG_PATH=$(libdir)/pkgconfig $(bindir)/guile-config link`
box/box: box/box.o box/box: box/box.o

3
meta/Makefile.am
View file

@ -21,7 +21,8 @@
## Floor, Boston, MA 02110-1301 USA ## Floor, Boston, MA 02110-1301 USA
bin_SCRIPTS=guile-config guile-tools 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 guile-1.8.pc.in guile-1.8-uninstalled.pc.in
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

6
meta/guile-config
View file

@ -79,7 +79,11 @@ exec guile -e main -s $0 "$@"
(ret (close-pipe pipe))) (ret (close-pipe pipe)))
(case (status:exit-val ret) (case (status:exit-val ret)
((0) (if (eof-object? output) "" output)) ((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) (define (show-version args)
(format (current-error-port) "~A - Guile version ~A" (format (current-error-port) "~A - Guile version ~A"

2
meta/uninstalled-env.in
View file

@ -93,7 +93,7 @@ export PKG_CONFIG_PATH
# handle PATH (no clobber) # handle PATH (no clobber)
PATH="${top_builddir}/libguile:${PATH}" PATH="${top_builddir}/libguile:${PATH}"
PATH="${top_builddir}/meta:${PATH}" PATH="${top_srcdir}/meta:${PATH}"
export PATH export PATH
exec "$@" exec "$@"