[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 09/19: Merge commit '5fac1a7ada362d78f13143acbc0ceca7f2f
From: |
Andy Wingo |
Subject: |
[Guile-commits] 09/19: Merge commit '5fac1a7ada362d78f13143acbc0ceca7f2f101de' |
Date: |
Thu, 22 Jan 2015 13:54:40 +0000 |
wingo pushed a commit to branch master
in repository guile.
commit 12dfe6568c82ba0e55286d1b604044f948dd16f2
Merge: a5b5cb4 5fac1a7
Author: Andy Wingo <address@hidden>
Date: Thu Jan 22 13:30:25 2015 +0100
Merge commit '5fac1a7ada362d78f13143acbc0ceca7f2f101de'
Conflicts:
configure.ac
doc/ref/libguile-parallel.texi
configure.ac | 5 +--
doc/ref/libguile-parallel.texi | 19 +++++++++++-
meta/Makefile.am | 60 ++++++++++++++++++++++++++++------------
meta/guile-2.2.pc.in | 7 ++++
4 files changed, 67 insertions(+), 24 deletions(-)
diff --cc configure.ac
index 6e83af1,d3a27eb..19e00d8
--- a/configure.ac
+++ b/configure.ac
@@@ -5,7 -5,7 +5,7 @@@ dn
define(GUILE_CONFIGURE_COPYRIGHT,[[
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-- 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation,
Inc.
++ 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software
Foundation, Inc.
This file is part of GUILE
diff --cc doc/ref/libguile-parallel.texi
index a0e1ea9,50b5339..166766e
--- a/doc/ref/libguile-parallel.texi
+++ b/doc/ref/libguile-parallel.texi
@@@ -1,7 -1,7 +1,7 @@@
@c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual.
- @c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010, 2011,
2013
- @c Free Software Foundation, Inc.
+ @c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010, 2011,
address@hidden 2014 Free Software Foundation, Inc.
address@hidden 2013-2014 Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions.
@node Parallel Installations
diff --cc meta/Makefile.am
index 283f3f1,5f19db5..b543c5e
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@@ -2,7 -2,7 +2,7 @@@
## Jim Blandy <address@hidden> --- September 1997
##
## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011,
--## 2012, 2013, 2014 Free Software Foundation, Inc.
++## 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
##
## This file is part of GUILE.
##
@@@ -22,9 -22,9 +22,10 @@@
## Fifth Floor, Boston, MA 02110-1301 USA
bin_SCRIPTS = guile-config guild
--EXTRA_DIST= \
-- guile.m4 ChangeLog-2008 \
- guile-2.2.pc.in guile-2.2-uninstalled.pc.in \
- guile-2.0.pc.in guile-2.0-uninstalled.pc.in \
++EXTRA_DIST= \
++ guile.m4 ChangeLog-2008 \
++ guile-$(GUILE_EFFECTIVE_VERSION).pc.in \
++ guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc.in \
guild.in guile-config.in
# What we now call `guild' used to be known as `guile-tools'.
@@@ -37,20 -37,46 +38,46 @@@ install-exec-hook
$(LN_S) "$$guild" "$$guile_tools"
pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = guile-2.2.pc
-pkgconfig_DATA = guile-2.0.pc
++pkgconfig_DATA = guile-$(GUILE_EFFECTIVE_VERSION).pc
## FIXME: in the future there will be direct automake support for
## doing this. When that happens, switch over.
aclocaldir = $(datadir)/aclocal
aclocal_DATA = guile.m4
+ # Script to instantiate substitution variables found on the standard
+ # input. We do this from the Makefile because we need things like
+ # $(program_transform_name), which are not usable from 'configure.ac'.
+ substitute = \
+ guile="`echo guile | $(SED) -e '$(program_transform_name)'`" ; \
+ guild="`echo guild | $(SED) -e '$(program_transform_name)'`" ; \
+ installed_guile="@bindir@/$$guile" ;
\
+ $(SED) -e "s,address@hidden@],$(PACKAGE_NAME),g" \
+ -e "s,address@hidden@],$(PACKAGE_BUGREPORT),g" \
+ -e "s,address@hidden@],$(PKG_CONFIG),g" \
+ -e "s,address@hidden@],$(pkgconfigdir),g" \
+ -e "s,address@hidden@],$(prefix),g" \
+ -e "s,address@hidden@],$(exec_prefix),g" \
+ -e "s,address@hidden@],$(bindir),g" \
+ -e "s,address@hidden@],$(libdir),g" \
+ -e "s,address@hidden@],$(includedir),g" \
+ -e "s,address@hidden@],$(datarootdir),g" \
+ -e "s,address@hidden@],$(datadir),g" \
+ -e "s,address@hidden@],$(sitedir),g" \
+ -e "s,address@hidden@],$$guile,g"
\
+ -e "s,address@hidden@],$$guild,g"
\
+ -e "s,address@hidden@],$$installed_guile,g"
+
-guile-2.0.pc: guile-2.0.pc.in
++guile-$(GUILE_EFFECTIVE_VERSION).pc: guile-$(GUILE_EFFECTIVE_VERSION).pc.in
+ $(substitute) < "$<" > "address@hidden"
+ mv "address@hidden" "$@"
+
-guile-2.0-uninstalled.pc: guile-2.0-uninstalled.pc.in
++guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc:
guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc.in
+ $(substitute) < "$<" > "address@hidden"
+ mv "address@hidden" "$@"
+
guile-config: $(srcdir)/guile-config.in $(top_builddir)/config.status
- guile="@bindir@/`echo guile | $(SED) -e '$(program_transform_name)'`" ;
\
- $(SED) -e "s,address@hidden@],$(pkgconfigdir),g"
\
- -e "s,address@hidden@],$(PKG_CONFIG),g"
\
- -e "s,address@hidden@],$$guile,g"
\
- < "$(srcdir)/guile-config.in"
\
- > "address@hidden"
+ $(substitute) < "$<" > "address@hidden"
chmod +x "address@hidden"
mv "address@hidden" "$@"
@@@ -64,4 -85,6 +86,6 @@@ guild: $(srcdir)/guild.in $(top_builddi
chmod +x "address@hidden"
mv "address@hidden" "$@"
- CLEANFILES = guile-config guild
+ CLEANFILES = \
+ guile-config guild \
- guile-2.0.pc guile-2.0-uninstalled.pc
++ guile-$(GUILE_EFFECTIVE_VERSION).pc
guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc
- [Guile-commits] branch master updated (015c3c0 -> 4247d8e), Andy Wingo, 2015/01/22
- [Guile-commits] 01/19: Merge commit 'b1451ad859183ae48c624d19ec144306bd2d3e3a', Andy Wingo, 2015/01/22
- [Guile-commits] 02/19: Merge commit '5af307de43e4b65eec7f235b48a8908f2a00f134', Andy Wingo, 2015/01/22
- [Guile-commits] 05/19: Merge commit 'a7bbba05838cabe2294f498e7008e1c51db6d664', Andy Wingo, 2015/01/22
- [Guile-commits] 03/19: Add allocate-struct, struct-ref, struct-set! instructions, Andy Wingo, 2015/01/22
- [Guile-commits] 06/19: Merge commit 'fdd319e9bd4121d844662d3d8ccc69b462b60840', Andy Wingo, 2015/01/22
- [Guile-commits] 07/19: Merge commit '81d2c84674f03f9028f26474ab19d3d3f353881a', Andy Wingo, 2015/01/22
- [Guile-commits] 04/19: Keywords have a tc7, Andy Wingo, 2015/01/22
- [Guile-commits] 09/19: Merge commit '5fac1a7ada362d78f13143acbc0ceca7f2f101de',
Andy Wingo <=
- [Guile-commits] 08/19: Merge commit '8cf2a7ba7432d68b9a055d29f18117be70375af9', Andy Wingo, 2015/01/22
- [Guile-commits] 10/19: Merge commit '7c433cbbce83bc9f2f9967afba00bbb68e312657', Andy Wingo, 2015/01/22
- [Guile-commits] 11/19: Merge commit '47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4', Andy Wingo, 2015/01/22
- [Guile-commits] 13/19: Merge commit 'cdcba5b2f6270de808e51b3b933374170611b91d', Andy Wingo, 2015/01/22
- [Guile-commits] 14/19: Merge commit '37b1453032488de582175270d1b3a1653ea81457', Andy Wingo, 2015/01/22
- [Guile-commits] 15/19: Merge commit '5943a62042432b86d757200ef595d7aebb5c9bac', Andy Wingo, 2015/01/22
- [Guile-commits] 18/19: Merge commit 'ed72201a795ac1c8d6c0288b6bb710f2bd0ebd9c', Andy Wingo, 2015/01/22
- [Guile-commits] 16/19: Merge commit '894d0b894daae001495c748b3352cd79918d3789', Andy Wingo, 2015/01/22
- [Guile-commits] 17/19: Merge commit '01a301d1b606b84d986b735049e7155d2f4cd6aa', Andy Wingo, 2015/01/22
- [Guile-commits] 12/19: Merge commit '5d971db802eaa8038db17e1aa5b4c69452739744', Andy Wingo, 2015/01/22