From 84af16a69c896a55c013f09edd756438dc990bb6 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 17 Jan 2006 11:11:39 +0100 Subject: configure.ac (dbexecdir): New substituted var. * configure.ac (dbexecdir): New substituted var. * configure: Rebuilt. * Makefile.am (dbexecdir): Remove. * Makefile.in: Rebuilt. From-SVN: r109814 --- libjava/configure.ac | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libjava/configure.ac') diff --git a/libjava/configure.ac b/libjava/configure.ac index 6ae8360..26a7ef5 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1239,6 +1239,14 @@ AC_SUBST(toolexecdir) AC_SUBST(toolexecmainlibdir) AC_SUBST(toolexeclibdir) +# Determine where the standard .db file is found. +multi_os_directory=`$CC -print-multi-os-directory` +case $multi_os_directory in + .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /. + *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;; +esac +AC_SUBST(dbexecdir) + # Determine gcj version number. gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'` GCJVERSION=$gcjversion -- cgit v1.1