guile.m4 tweaks

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

diff --git a/meta/Makefile.am b/meta/Makefile.am
index c8bdacc..2d3c462 100644 (file)
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -1,7 +1,8 @@
 ## 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,
+##        2012, 2013 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##   
@@ -20,11 +21,20 @@
 ##   write to the Free Software Foundation, Inc., 51 Franklin Street,
 ##   Fifth Floor, Boston, MA 02110-1301 USA
 
-bin_SCRIPTS = guile-config
-EXTRA_DIST= $(bin_SCRIPTS)                     \
+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
+  guild.in guile-config.in
+
+# What we now call `guild' used to be known as `guile-tools'.
+install-exec-hook:
+       guild="`echo $(ECHO_N) guild                            \
+          | $(SED) -e '$(program_transform_name)'`" ;          \
+       guile_tools="`echo $(ECHO_N) guile-tools                \
+          | $(SED) -e '$(program_transform_name)'`" ;          \
+       cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" &&      \
+       $(LN_S) "$$guild" "$$guile_tools"
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guile-2.0.pc
@@ -33,3 +43,15 @@ pkgconfig_DATA = guile-2.0.pc
 ## doing this.  When that happens, switch over.
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = guile.m4
+
+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"                        \
+                -e "s,@""PKG_CONFIG@,$(PKG_CONFIG),g"                          \
+                -e "s,@installed_guile@,$$guile,g"                             \
+       > guile-config.out
+       mv guile-config.out guile-config
+       chmod +x guile-config
+
+CLEANFILES = guile-config