Merge commit '5af307de43e4b65eec7f235b48a8908f2a00f134'

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

diff --git a/meta/Makefile.am b/meta/Makefile.am
index 2d3c462..283f3f1 100644 (file)
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -2,7 +2,7 @@
 ## Jim Blandy <jimb@red-bean.com> --- September 1997
 ##
 ##     Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011,
-##        2012, 2013 Free Software Foundation, Inc.
+##        2012, 2013, 2014 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##   
@@ -24,7 +24,7 @@
 bin_SCRIPTS = guile-config guild
 EXTRA_DIST= \
   guile.m4 ChangeLog-2008                      \
-  guile-2.0.pc.in guile-2.0-uninstalled.pc.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'.
@@ -37,7 +37,7 @@ install-exec-hook:
        $(LN_S) "$$guild" "$$guile_tools"
 
 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.
@@ -46,12 +46,22 @@ 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
+       $(SED) -e "s,[@]pkgconfigdir[@],$(pkgconfigdir),g"                      \
+              -e "s,[@]PKG_CONFIG[@],$(PKG_CONFIG),g"                          \
+              -e "s,[@]installed_guile[@],$$guile,g"                           \
+         < "$(srcdir)/guile-config.in"                                         \
+         > "$@.out"
+       chmod +x "$@.out"
+       mv "$@.out" "$@"
 
-CLEANFILES = guile-config
+guild: $(srcdir)/guild.in $(top_builddir)/config.status
+       guile="@bindir@/`echo guile | $(SED) -e '$(program_transform_name)'`" ; \
+       $(SED) -e "s,[@]installed_guile[@],$$guile,g"                           \
+              -e "s,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g"                      \
+              -e "s,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g"            \
+         < "$(srcdir)/guild.in"                                                \
+         > "$@.out"
+       chmod +x "$@.out"
+       mv "$@.out" "$@"
+
+CLEANFILES = guile-config guild