make install fails on 3.3 branch in libffi

[Christian Cornelssen]

Hi,

On Tue, 28 Jan 2003, Andreas Schwab wrote:

> IMHO libffi_basedir should get ${srcdir} removed.  Could you please try
> this patch?
>
> 2003-01-28  Andreas Schwab  <schwab@suse.de>
>
> 	* configure.in (libffi_basedir): Remove ${srcdir} from value and
> 	include trailing slash if nonempty.

That's incomplete.  Some lines below, `configure.in' contains

   ac_file=Makefile . ${libffi_basedir}/../config-ml.in

which should then read

   ac_file=Makefile . ${srcdir}/${libffi_basedir}../config-ml.in

An updated patch is in the attachment (not tested yet).

However, note that the mainline has identical fragments, but
nevertheless, mkinstalldirs gets defined correctly(?).
The difference: 3.3's libffi used Automake-1.4, and the 3.4 version
uses Automake-1.4p5.  Perhaps this solves the problem best?

Regards,

Christian Cornelssen
-------------- next part --------------
Index: libffi/configure.in
===================================================================
RCS file: /usr/local/src/cvs/gcc-cvs/gcc/libffi/configure.in,v
retrieving revision 1.33.2.1
diff -u -r1.33.2.1 configure.in
--- libffi/configure.in	28 Jan 2003 01:44:57 -0000	1.33.2.1
+++ libffi/configure.in	28 Jan 2003 23:15:08 -0000
@@ -22,15 +22,15 @@
 
 if test "${srcdir}" = "."; then
   if test "${with_target_subdir}" != "."; then
-    libffi_basedir="${srcdir}/${with_multisrctop}.."
+    libffi_basedir="${with_multisrctop}../"
   else
-    libffi_basedir="${srcdir}/${with_multisrctop}"
+    libffi_basedir="${with_multisrctop}"
   fi
 else
-  libffi_basedir="${srcdir}"
+  libffi_basedir=
 fi
 AC_SUBST(libffi_basedir)
-AC_CONFIG_AUX_DIR(${libffi_basedir}/..)
+AC_CONFIG_AUX_DIR(${libffi_basedir}..)
 
 AC_CANONICAL_HOST
 
@@ -186,7 +186,7 @@
 [
 if test -n "$CONFIG_FILES"; then
    LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-   ac_file=Makefile . ${libffi_basedir}/../config-ml.in
+   ac_file=Makefile . ${srcdir}/${libffi_basedir}../config-ml.in
 fi
 ],
 srcdir=${srcdir}