Fix lib install dir

6 files changed, 38 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f7866b..6c8ea2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-17  Anthony Green  <green@moxielogic.com>
+
+	* configure.ac: Only modify toolexecdir in certain cases.
+	* configure: Rebuilt.
+
 2013-03-16  Gilles Talis  <gilles.talis@gmail.com>
 
 	* src/powerpc/ffi.c (ffi_prep_args_SYSV): Don't use
diff --git a/configure b/configure
index 0556b00..734b63c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libffi 3.0.13rc1.
+# Generated by GNU Autoconf 2.69 for libffi 3.0.13-rc2.
 #
 # Report bugs to <http://github.com/atgreen/libffi/issues>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libffi'
 PACKAGE_TARNAME='libffi'
-PACKAGE_VERSION='3.0.13rc1'
-PACKAGE_STRING='libffi 3.0.13rc1'
+PACKAGE_VERSION='3.0.13-rc2'
+PACKAGE_STRING='libffi 3.0.13-rc2'
 PACKAGE_BUGREPORT='http://github.com/atgreen/libffi/issues'
 PACKAGE_URL=''
 
@@ -1407,7 +1407,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libffi 3.0.13rc1 to adapt to many kinds of systems.
+\`configure' configures libffi 3.0.13-rc2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1478,7 +1478,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libffi 3.0.13rc1:";;
+     short | recursive ) echo "Configuration of libffi 3.0.13-rc2:";;
    esac
   cat <<\_ACEOF
 
@@ -1598,7 +1598,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libffi configure 3.0.13rc1
+libffi configure 3.0.13-rc2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2204,7 +2204,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libffi $as_me 3.0.13rc1, which was
+It was created by libffi $as_me 3.0.13-rc2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3247,7 +3247,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libffi'
- VERSION='3.0.13rc1'
+ VERSION='3.0.13-rc2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14843,7 +14843,7 @@ if test "x$GCC" = "xyes"; then
   multi_os_directory=`$CC -print-multi-os-directory`
   case $multi_os_directory in
     .) ;; # Avoid trailing /.
-    *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+    ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
   esac
 
 else
@@ -15549,7 +15549,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libffi $as_me 3.0.13rc1, which was
+This file was extended by libffi $as_me 3.0.13-rc2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15619,7 +15619,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libffi config.status 3.0.13rc1
+libffi config.status 3.0.13-rc2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 544b149..52583b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this with autoconf to create configure
 
 AC_PREREQ(2.68)
 
-AC_INIT([libffi], [3.0.13rc1], [http://github.com/atgreen/libffi/issues])
+AC_INIT([libffi], [3.0.13-rc2], [http://github.com/atgreen/libffi/issues])
 AC_CONFIG_HEADERS([fficonfig.h])
 
 AC_CANONICAL_SYSTEM
@@ -549,7 +549,7 @@ if test "x$GCC" = "xyes"; then
   multi_os_directory=`$CC -print-multi-os-directory`
   case $multi_os_directory in
     .) ;; # Avoid trailing /.
-    *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+    ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
   esac
   AC_SUBST(toolexecdir)
 else
diff --git a/doc/libffi.info b/doc/libffi.info
index 6d5acf8..7887647 100644
--- a/doc/libffi.info
+++ b/doc/libffi.info
@@ -1,5 +1,5 @@
-This is ../libffi/doc/libffi.info, produced by makeinfo version 4.13
-from ../libffi/doc/libffi.texi.
+This is ../doc/libffi.info, produced by makeinfo version 4.13 from
+../doc/libffi.texi.
 
 This manual is for Libffi, a portable foreign-function interface
 library.
@@ -598,19 +598,19 @@ Index
 
 
 Tag Table:
-Node: Top712
-Node: Introduction1460
-Node: Using libffi3096
-Node: The Basics3582
-Node: Simple Example7224
-Node: Types8251
-Node: Primitive Types8534
-Node: Structures10354
-Node: Type Example11224
-Node: Multiple ABIs12447
-Node: The Closure API12818
-Node: Closure Example15762
-Node: Missing Features17321
-Node: Index17774
+Node: Top698
+Node: Introduction1446
+Node: Using libffi3082
+Node: The Basics3568
+Node: Simple Example7210
+Node: Types8237
+Node: Primitive Types8520
+Node: Structures10340
+Node: Type Example11210
+Node: Multiple ABIs12433
+Node: The Closure API12804
+Node: Closure Example15748
+Node: Missing Features17307
+Node: Index17760
 
 End Tag Table
diff --git a/doc/stamp-vti b/doc/stamp-vti
index aec3d99..369e368 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 16 March 2013
 @set UPDATED-MONTH March 2013
-@set EDITION 3.0.13rc1
-@set VERSION 3.0.13rc1
+@set EDITION 3.0.13-rc1
+@set VERSION 3.0.13-rc1
diff --git a/doc/version.texi b/doc/version.texi
index aec3d99..369e368 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 16 March 2013
 @set UPDATED-MONTH March 2013
-@set EDITION 3.0.13rc1
-@set VERSION 3.0.13rc1
+@set EDITION 3.0.13-rc1
+@set VERSION 3.0.13-rc1