This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[committed] Fix libobjc install
- From: neroden at twcny dot rr dot com (Nathanael Nerode)
- To: gcc-patches at gcc dot gnu dot org
- Date: Wed, 14 Apr 2004 16:07:43 -0400
- Subject: [committed] Fix libobjc install
Committed as obvious; this fixes my own mistake.
* configure.ac: Restore toolexecdir.
* Makefile.in: Restore toolexecdir.
* configure: Regenerate.
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/configure.ac,v
retrieving revision 1.2
diff -u -r1.2 configure.ac
--- configure.ac 9 Apr 2004 13:18:25 -0000 1.2
+++ configure.ac 14 Apr 2004 20:04:14 -0000
@@ -125,19 +125,23 @@
AC_SUBST(gcc_version)
# Calculate toolexeclibdir
+# Also toolexecdir, though it's only used in toolexeclibdir
case ${version_specific_libs} in
yes)
# Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option
# is selected.
+ toolexecdir='$(libdir)/gcc/$(target_noncanonical)'
toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
;;
no)
if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then
# Install a library built with a cross compiler in tooldir, not libdir.
+ toolexecdir='$(exec_prefix)/$(target_noncanonical)'
toolexeclibdir='$(toolexecdir)/lib'
else
+ toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
@@ -147,6 +151,7 @@
esac
;;
esac
+AC_SUBST(toolexecdir)
AC_SUBST(toolexeclibdir)
# --------
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/Makefile.in,v
retrieving revision 1.35
diff -u -r1.35 Makefile.in
--- Makefile.in 9 Apr 2004 13:13:07 -0000 1.35
+++ Makefile.in 14 Apr 2004 20:07:15 -0000
@@ -36,6 +36,8 @@
gcc_version = @gcc_version@
top_srcdir = @top_srcdir@
toplevel_srcdir = @toplevel_srcdir@
+toolexecdir = @toolexecdir@
+# Toolexecdir is used only by toolexeclibdir
toolexeclibdir = @toolexeclibdir@
top_builddir = .
--
Make sure your vote will count.
http://www.verifiedvoting.org/