Merge commit '5fac1a7ada362d78f13143acbc0ceca7f2f101de'

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

diff --git a/meta/Makefile.am b/meta/Makefile.am
index acf8854..b543c5e 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 Free Software Foundation, Inc.
+##        2012, 2013, 2014, 2015 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##   
@@ -22,36 +22,70 @@
 ##   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  \
+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'.
-install-data-hook:
+install-exec-hook:
        guild="`echo $(ECHO_N) guild                            \
-          | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \
+          | $(SED) -e '$(program_transform_name)'`" ;          \
        guile_tools="`echo $(ECHO_N) guile-tools                \
-          | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \
+          | $(SED) -e '$(program_transform_name)'`" ;          \
        cd $(DESTDIR)$(bindir) && rm -f "$$guile_tools" &&      \
        $(LN_S) "$$guild" "$$guile_tools"
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = guile-2.2.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,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g"                   \
+        -e "s,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g"          \
+        -e "s,[@]PKG_CONFIG[@],$(PKG_CONFIG),g"                        \
+        -e "s,[@]pkgconfigdir[@],$(pkgconfigdir),g"                    \
+        -e "s,[@]prefix[@],$(prefix),g"                                \
+        -e "s,[@]exec_prefix[@],$(exec_prefix),g"                      \
+        -e "s,[@]bindir[@],$(bindir),g"                                \
+        -e "s,[@]libdir[@],$(libdir),g"                                \
+        -e "s,[@]includedir[@],$(includedir),g"                        \
+        -e "s,[@]datarootdir[@],$(datarootdir),g"                      \
+        -e "s,[@]datadir[@],$(datadir),g"                              \
+        -e "s,[@]sitedir[@],$(sitedir),g"                              \
+        -e "s,[@]guile[@],$$guile,g"                                   \
+        -e "s,[@]guild[@],$$guild,g"                                   \
+        -e "s,[@]installed_guile[@],$$installed_guile,g"
+
+guile-$(GUILE_EFFECTIVE_VERSION).pc: guile-$(GUILE_EFFECTIVE_VERSION).pc.in
+       $(substitute) < "$<" > "$@.out"
+       mv "$@.out" "$@"
+
+guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc: guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc.in
+       $(substitute) < "$<" > "$@.out"
+       mv "$@.out" "$@"
+
 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 ;                       \
-                    s,@""PKG_CONFIG@,$(PKG_CONFIG),g ;                         \
-                    s,@installed_guile@,$$guile,g"                             \
-       > guile-config.out
-       mv guile-config.out guile-config
-       chmod +x guile-config
-
-CLEANFILES = guile-config
+       $(substitute) < "$<" > "$@.out"
+       chmod +x "$@.out"
+       mv "$@.out" "$@"
+
+guild: $(srcdir)/guild.in $(top_builddir)/config.status
+       $(substitute) < "$<" > "$@.out"
+       chmod +x "$@.out"
+       mv "$@.out" "$@"
+
+CLEANFILES =                                   \
+  guile-config guild                           \
+  guile-$(GUILE_EFFECTIVE_VERSION).pc guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc