Commit 3123c967 by Andreas Jaeger

Fix wrongly applied last patch.

From-SVN: r62239
parent 5175d1b8
...@@ -633,7 +633,7 @@ fi ...@@ -633,7 +633,7 @@ fi
if test "${srcdir}" = "."; then if test "${srcdir}" = "."; then
if test "${with_target_subdir}" != "."; then if test "${with_target_subdir}" != "."; then
libffi_basedir="${with_multisrctop}.." libffi_basedir="${with_multisrctop}../"
else else
libffi_basedir="${with_multisrctop}" libffi_basedir="${with_multisrctop}"
fi fi
...@@ -4094,7 +4094,7 @@ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ...@@ -4094,7 +4094,7 @@ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
if test -n "$CONFIG_FILES"; then if test -n "$CONFIG_FILES"; then
LD="${ORIGINAL_LD_FOR_MULTILIBS}" LD="${ORIGINAL_LD_FOR_MULTILIBS}"
ac_file=Makefile . ${srcdir}/${libffi_basedir}/../config-ml.in ac_file=Makefile . ${srcdir}/${libffi_basedir}../config-ml.in
fi fi
exit 0 exit 0
......
...@@ -22,7 +22,7 @@ dnl --with-target-subdir, --with-multisrctop, --with-multisubdir ...@@ -22,7 +22,7 @@ dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
if test "${srcdir}" = "."; then if test "${srcdir}" = "."; then
if test "${with_target_subdir}" != "."; then if test "${with_target_subdir}" != "."; then
libffi_basedir="${with_multisrctop}.." libffi_basedir="${with_multisrctop}../"
else else
libffi_basedir="${with_multisrctop}" libffi_basedir="${with_multisrctop}"
fi fi
...@@ -186,7 +186,7 @@ AC_OUTPUT(include/Makefile include/ffi.h Makefile, ...@@ -186,7 +186,7 @@ AC_OUTPUT(include/Makefile include/ffi.h Makefile,
[ [
if test -n "$CONFIG_FILES"; then if test -n "$CONFIG_FILES"; then
LD="${ORIGINAL_LD_FOR_MULTILIBS}" LD="${ORIGINAL_LD_FOR_MULTILIBS}"
ac_file=Makefile . ${srcdir}/${libffi_basedir}/../config-ml.in ac_file=Makefile . ${srcdir}/${libffi_basedir}../config-ml.in
fi fi
], ],
srcdir=${srcdir} srcdir=${srcdir}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment