From 45dff86efa42f35786a2624ff70d7304d3e7ef77 Mon Sep 17 00:00:00 2001 From: Alexander Malmberg Date: Thu, 28 Aug 2003 01:15:06 +0000 Subject: [PATCH] Makefile.in, aclocal.m4: Update to $(libdir)/gcc/ instead of (libdir)/gcc-lib/ when installing. 2003-08-27 Alexander Malmberg * Makefile.in, aclocal.m4: Update to $(libdir)/gcc/ instead of (libdir)/gcc-lib/ when installing. * configure: Regenerate. From-SVN: r70879 --- libobjc/ChangeLog | 6 ++++++ libobjc/Makefile.in | 2 +- libobjc/aclocal.m4 | 2 +- libobjc/configure | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 433baed342e0..f17d8e7bde38 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,9 @@ +2003-08-27 Alexander Malmberg + + * Makefile.in, aclocal.m4: Update to $(libdir)/gcc/ instead of + (libdir)/gcc-lib/ when installing. + * configure: Regenerate. + Thu Jul 10 10:27:43 2003 Nicola Pero libobjc/9969 diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 1d3f717bba9f..aea1e2ce32b7 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -43,7 +43,7 @@ glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@ top_builddir = . libdir = $(exec_prefix)/lib -libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version) +libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version) # Multilib support variables. MULTISRCTOP = diff --git a/libobjc/aclocal.m4 b/libobjc/aclocal.m4 index 83707ce099e2..458b157cf02a 100644 --- a/libobjc/aclocal.m4 +++ b/libobjc/aclocal.m4 @@ -196,7 +196,7 @@ if test $version_specific_libs = yes; then # and header files if --enable-version-specific-runtime-libs option # is selected. changequote(,)dnl - glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)' glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' changequote([,])dnl fi diff --git a/libobjc/configure b/libobjc/configure index be0dde9d285c..a4557060cf16 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -1255,7 +1255,7 @@ if test $version_specific_libs = yes; then # Need the gcc compiler version to know where to install libraries # and header files if --enable-version-specific-runtime-libs option # is selected. - glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)' glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)' fi