On 09/20/2011 09:51 PM, Joseph S. Myers wrote:
Some target libraries have

# Subdir rules rely on $(FLAGS_TO_PASS)
FLAGS_TO_PASS = $(AM_MAKEFLAGS)

in their Makefile.am.  This was introduced to libstdc++-v3 by
<http://gcc.gnu.org/ml/libstdc++/2002-06/msg00098.html>  to fix a
problem described in
<http://gcc.gnu.org/ml/libstdc++/2002-05/msg00159.html>  and
subsequently added to libjava in
<http://gcc.gnu.org/ml/java-patches/2002-q4/msg00105.html>  (it's also
now in libgo).

libquadmath lacks this definition, and apparently as a result running
'make install infodir=/some/where' installs some multilib copies of
libquadmath.info in directories based on $prefix rather than the
infodir passed at install time.  This patch fixes this problem.
Bootstrapped with no regressions on x86_64-unknown-linux-gnu.  OK to
commit?

(I do not know whether bugs may arise in other target libraries from
their lack of this definition; it's specifically libquadmath where
I've observed the problem as a regression in 4.6/4.7 with an info file
newly installed in the wrong place.)

2011-09-20  Joseph Myers<jos...@codesourcery.com>

        * Makefile.am (FLAGS_TO_PASS): Define.
        * Makefile.in: Regenerate.

Index: libquadmath/Makefile.in
===================================================================
--- libquadmath/Makefile.in     (revision 179007)
+++ libquadmath/Makefile.in     (working copy)
@@ -385,6 +385,9 @@
  @BUILD_LIBQUADMATH_TRUE@      "RANLIB=$(RANLIB)" \
  @BUILD_LIBQUADMATH_TRUE@      "DESTDIR=$(DESTDIR)"

+
+# Subdir rules rely on $(FLAGS_TO_PASS)
+@BUILD_LIBQUADMATH_TRUE@FLAGS_TO_PASS = $(AM_MAKEFLAGS)
  @BUILD_LIBQUADMATH_TRUE@MAKEOVERRIDES =
  @BUILD_LIBQUADMATH_TRUE@@GENINSRC_FALSE@STAMP_GENINSRC =

Index: libquadmath/Makefile.am
===================================================================
--- libquadmath/Makefile.am     (revision 179007)
+++ libquadmath/Makefile.am     (working copy)
@@ -107,6 +107,9 @@
        "RANLIB=$(RANLIB)" \
        "DESTDIR=$(DESTDIR)"

+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
  MAKEOVERRIDES=

  # AM_CONDITIONAL on configure option --generated-files-in-srcdir


Ok.

Paolo

Reply via email to