RFA: Install libobjc under gcc/, not gcc-lib/

[Alexander Malmberg <alexander at malmberg dot org>]

Hi,

It seems that gcc was recently changed to install and search for runtime
libraries in $prefix/lib/gcc/{i686-pc-linux-gnu,whatever}/3.4/ instead
of $prefix/lib/gcc-lib/... This patch updates libobjc to install under
lib/gcc/ instead of lib/gcc-lib/ (when using version specific runtime
libs). This is necessary for objc-improvements-branch, and as far as I
can tell for mainline as well.

Just to make things really clear, this only affects the GNU objective-c
runtime.

I don't have write access; someone else will have to commit it.

- Alexander Malmberg

Index: libobjc/Makefile.in
===================================================================
RCS file: /cvsroot/gcc/gcc/libobjc/Makefile.in,v
retrieving revision 1.24
diff -u -r1.24 Makefile.in
--- libobjc/Makefile.in	23 May 2003 20:04:58 -0000	1.24
+++ libobjc/Makefile.in	14 Aug 2003 15:06:50 -0000
@@ -43,7 +43,7 @@
 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 =
Index: libobjc/aclocal.m4
===================================================================
RCS file: /cvsroot/gcc/gcc/libobjc/aclocal.m4,v
retrieving revision 1.7
diff -u -r1.7 aclocal.m4
--- libobjc/aclocal.m4	12 Mar 2003 21:34:21 -0000	1.7
+++ libobjc/aclocal.m4	14 Aug 2003 15:06:50 -0000
@@ -196,7 +196,7 @@
   # 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
@@ -209,7 +209,7 @@
     glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
     glibcpp_toolexeclibdir='$(toolexecdir)/lib'
   else
-    glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+    glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
     glibcpp_toolexeclibdir='$(libdir)'
   fi
   multi_os_directory=`$CC -print-multi-os-directory`
Index: libobjc/configure
===================================================================
RCS file: /cvsroot/gcc/gcc/libobjc/configure,v
retrieving revision 1.30
diff -u -r1.30 configure
--- libobjc/configure	11 Apr 2003 04:20:16 -0000	1.30
+++ libobjc/configure	14 Aug 2003 15:06:55 -0000
@@ -1255,7 +1255,7 @@
   # 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
 
@@ -1267,7 +1267,7 @@
     glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
     glibcpp_toolexeclibdir='$(toolexecdir)/lib'
   else
-    glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+    glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
     glibcpp_toolexeclibdir='$(libdir)'
   fi
   multi_os_directory=`$CC -print-multi-os-directory`