Merge remote-tracking branch 'local-2.0/stable-2.0'

[bpt/guile.git] / meta / Makefile.am

diff --git a/meta/Makefile.am b/meta/Makefile.am
index ad269ba..5b811c0 100644 (file)
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with Automake to create Makefile.in
 ## Jim Blandy <jimb@red-bean.com> --- September 1997
 ##
-##     Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##   
@@ -20,21 +20,26 @@
 ##   write to the Free Software Foundation, Inc., 51 Franklin Street,
 ##   Fifth Floor, Boston, MA 02110-1301 USA
 
-bin_SCRIPTS = guile-config guile-tools
+bin_SCRIPTS = guile-config guild
 EXTRA_DIST= \
   guile.m4 ChangeLog-2008                      \
-  guile-2.0.pc.in guile-2.0-uninstalled.pc.in  \
-  guile-tools.in guile-config.in
+  guile-2.2.pc.in guile-2.2-uninstalled.pc.in  \
+  guild.in guile-config.in
+
+# What we now call `guild' used to be known as `guile-tools'.
+install-data-hook:
+       cd $(DESTDIR)$(bindir) && rm -f guile-tools$(EXEEXT) && \
+       $(LN_S) guild$(EXEEXT) guile-tools$(EXEEXT)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = guile-2.0.pc
+pkgconfig_DATA = guile-2.2.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
 
-guile-config: $(srcdir)/guile-config.in
+guile-config: $(srcdir)/guile-config.in $(top_builddir)/config.status
        guile="@bindir@/`echo guile | $(SED) -e '$(program_transform_name)'`" ; \
        cat $(srcdir)/guile-config.in                                                   \
        | $(SED) -e "s,@pkgconfigdir@,$(pkgconfigdir),g ;                       \