Version number fallout (fourth and hopefully last)

[Ian Lance Taylor]

Zack Weinberg <zack@codesourcery.com> writes:

> I plan to check this in tomorrow morning unless someone sees a problem
> with it between now and then.

I don't think you should delay the checkin, but I do think you should
try a multilib build at some point using a relative srcdir to make
sure that it still works.

> Index: libffi/include/Makefile.am
> --- libffi/include/Makefile.am	12 Nov 2003 18:18:30 -0000	1.3
> +++ libffi/include/Makefile.am	21 Mar 2005 02:26:26 -0000
> @@ -9,5 +9,8 @@ hackdir=$(includedir)
>  
>  hack_DATA= ffi.h
>  
> -toollibffidir = @tool_include_dir@/libffi
> +# Where generated headers like ffitarget.h get installed.
> +gcc_version   := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> +toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include/libffi
> +
>  toollibffi_HEADERS = ffitarget.h

Specifically, I am concerned that the gcc_version value above needs to
use
    $(top_srcdir)/$(MULTISRCTOP)../gcc/BASE_VER

> ===================================================================
> Index: libffi/test> Index: libgfortran/Makefile.am
> --- libgfortran/Makefile.am	23 Jan 2005 17:00:58 -0000	1.29
> +++ libgfortran/Makefile.am	21 Mar 2005 02:26:27 -0000
> @@ -5,6 +5,9 @@
>  AM_CFLAGS = -std=gnu99
>  ACLOCAL_AMFLAGS = -I ../config
>  
> +## May be used by toolexeclibdir.
> +gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
> +
>  toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la
>  
>  libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm

Here too.

And in various other Makefile.am files.  Basically any place where
gcc_version is set using "$(top_srcdir)/..".  I don't know for sure
that there is a problem here.  But it looks suspicious to me.

Ian