1
# DP: Install libjava libraries to multiarch location
3
Index: b/src/libjava/configure.ac
4
===================================================================
5
--- a/src/libjava/configure.ac
6
+++ b/src/libjava/configure.ac
8
.) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
9
*) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
11
+ multiarch=`$CC -print-multiarch`
12
+ if test -n "$multiarch"; then
13
+ toolexeclibdir=$toolexecmainlibdir/$multiarch
18
@@ -1610,6 +1614,10 @@
19
dbexecdir='$(libdir)/'$multi_os_directory/$gcjsubdir
22
+multiarch=`$CC -print-multiarch`
23
+if test -n "$multiarch"; then
24
+ dbexecdir='$(libdir)/'$multiarch/$gcjsubdir
29
Index: b/src/libjava/Makefile.am
30
===================================================================
31
--- a/src/libjava/Makefile.am
32
+++ b/src/libjava/Makefile.am
34
-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
35
-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
36
-DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \
37
- -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
38
+ -DLIBGCJ_DEFAULT_DATABASE="\"/var/lib/$(MULTIARCH_DIR)/gcj-4.8/$(db_name)\"" \
39
-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
42
Index: b/src/libjava/Makefile.in
43
===================================================================
44
--- a/src/libjava/Makefile.in
45
+++ b/src/libjava/Makefile.in
47
-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
48
-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
49
-DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \
50
- -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
51
+ -DLIBGCJ_DEFAULT_DATABASE="\"/var/lib/$(MULTIARCH_DIR)/gcj-4.8/$(db_name)\"" \
52
-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
55
Index: b/src/libjava/classpath/m4/acinclude.m4
56
===================================================================
57
--- a/src/libjava/classpath/m4/acinclude.m4
58
+++ b/src/libjava/classpath/m4/acinclude.m4
60
.) toolexeclibdir=${libdir} ;; # Avoid trailing /.
61
*) toolexeclibdir=${libdir}/${multi_os_directory} ;;
63
+ multiarch=`$CC -print-multiarch`
64
+ if test -n "$multiarch"; then
65
+ toolexeclibdir=${libdir}/${multiarch}
67
AC_SUBST(toolexeclibdir)
70
Index: b/src/libjava/classpath/configure.ac
71
===================================================================
72
--- a/src/libjava/classpath/configure.ac
73
+++ b/src/libjava/classpath/configure.ac
78
+dnl dummy change to run autoconf
81
AC_ARG_ENABLE(java-maintainer-mode,
82
AS_HELP_STRING([--enable-java-maintainer-mode],