Skip to content

R
riscv-gcc-1
Commit fe3dac3d by Tom Tromey Committed by Tom Tromey
Options

re PR bootstrap/3281 (Installation failure (mkinstalldirs)) 

	Fix for PR bootstrap/3281:
	* aclocal.m4, configure: Rebuilt.
	* acinclude.m4 (LIBGCJ_CONFIGURE): Don't set libgcj_flagbasedir.
	Correctly compute libgcj_basedir.
	(mkinstalldirs): Define and subst.

From-SVN: r43739
parent 57b74bf9
Showing with 67 additions and 33 deletions
libjava/ChangeLog
2001-07-02 Tom Tromey <tromey@redhat.com>
Fix for PR bootstrap/3281:
* aclocal.m4, configure: Rebuilt.
* acinclude.m4 (LIBGCJ_CONFIGURE): Don't set libgcj_flagbasedir.
Correctly compute libgcj_basedir.
(mkinstalldirs): Define and subst.
2001-07-01 Jeremy Nimmer <jwnimmer@alum.mit.edu>
For PR libgcj/3523:
......
libjava/Makefile.in
......@@ -119,6 +119,7 @@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@
here = @here@
libgcj_basedir = @libgcj_basedir@
mkinstalldirs = @mkinstalldirs@
AUTOMAKE_OPTIONS = foreign
@TESTSUBDIR_TRUE@SUBDIRS = \
......@@ -1187,7 +1188,6 @@ MULTISUBDIR =
MULTIDO = true
MULTICLEAN = true
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ./include/config.h ./gcj/libgcj-config.h
CONFIG_CLEAN_FILES = libgcj.spec libgcj-test.spec
LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
......
libjava/acinclude.m4
......@@ -12,23 +12,39 @@ AC_ARG_ENABLE(multilib,
dnl We may get other options which we dont document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
if test "[$]{srcdir}" = "."; then
if test "[$]{with_target_subdir}" != "."; then
libgcj_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
# When building with srcdir == objdir, links to the source files will
# be created in directories within the target_subdir. We have to
# adjust toplevel_srcdir accordingly, so that configure finds
# install-sh and other auxiliary files that live in the top-level
# source directory.
if test "${srcdir}" = "."; then
if test -z "${with_target_subdir}"; then
toprel=".."
else
libgcj_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
if test "${with_target_subdir}" != "."; then
toprel="${with_multisrctop}../.."
else
toprel="${with_multisrctop}.."
fi
fi
else
libgcj_basedir="[$]{srcdir}/$1"
toprel=".."
fi
libgcj_basedir=$srcdir/$toprel/$1/libjava
AC_SUBST(libgcj_basedir)
AC_CONFIG_AUX_DIR($libgcj_basedir/..)
AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
if :; then :; else
# This overrides the previous occurrence for automake, but not for
# autoconf, which is exactly what we want.
AC_CONFIG_AUX_DIR(..)
fi
# This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && pwd`/mkinstalldirs"
AC_SUBST(mkinstalldirs)
AC_CANONICAL_SYSTEM
dnl This shouldn't be needed, as long as top-level dependencies are
......@@ -85,11 +101,6 @@ libgcj_javaflags=
. [$]{srcdir}/configure.host
case [$]{libgcj_basedir} in
/* | [A-Za-z]:[/\\]*) libgcj_flagbasedir=[$]{libgcj_basedir} ;;
*) libgcj_flagbasedir='[$](top_builddir)/'[$]{libgcj_basedir} ;;
esac
LIBGCJ_CFLAGS="[$]{libgcj_cflags}"
LIBGCJ_CXXFLAGS="[$]{libgcj_cxxflags}"
LIBGCJ_JAVAFLAGS="[$]{libgcj_javaflags}"
......
libjava/aclocal.m4
......@@ -24,23 +24,39 @@ AC_ARG_ENABLE(multilib,
dnl We may get other options which we dont document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
if test "[$]{srcdir}" = "."; then
if test "[$]{with_target_subdir}" != "."; then
libgcj_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1"
# When building with srcdir == objdir, links to the source files will
# be created in directories within the target_subdir. We have to
# adjust toplevel_srcdir accordingly, so that configure finds
# install-sh and other auxiliary files that live in the top-level
# source directory.
if test "${srcdir}" = "."; then
if test -z "${with_target_subdir}"; then
toprel=".."
else
libgcj_basedir="[$]{srcdir}/[$]{with_multisrctop}$1"
if test "${with_target_subdir}" != "."; then
toprel="${with_multisrctop}../.."
else
toprel="${with_multisrctop}.."
fi
fi
else
libgcj_basedir="[$]{srcdir}/$1"
toprel=".."
fi
libgcj_basedir=$srcdir/$toprel/$1/libjava
AC_SUBST(libgcj_basedir)
AC_CONFIG_AUX_DIR($libgcj_basedir/..)
AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
if :; then :; else
# This overrides the previous occurrence for automake, but not for
# autoconf, which is exactly what we want.
AC_CONFIG_AUX_DIR(..)
fi
# This works around an automake problem.
mkinstalldirs="`cd $ac_aux_dir && pwd`/mkinstalldirs"
AC_SUBST(mkinstalldirs)
AC_CANONICAL_SYSTEM
dnl This shouldn't be needed, as long as top-level dependencies are
......@@ -97,11 +113,6 @@ libgcj_javaflags=
. [$]{srcdir}/configure.host
case [$]{libgcj_basedir} in
/* | [A-Za-z]:[/\\]*) libgcj_flagbasedir=[$]{libgcj_basedir} ;;
*) libgcj_flagbasedir='[$](top_builddir)/'[$]{libgcj_basedir} ;;
esac
LIBGCJ_CFLAGS="[$]{libgcj_cflags}"
LIBGCJ_CXXFLAGS="[$]{libgcj_cxxflags}"
LIBGCJ_JAVAFLAGS="[$]{libgcj_javaflags}"
......
libjava/gcj/Makefile.in
......@@ -121,12 +121,12 @@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@
here = @here@
libgcj_basedir = @libgcj_basedir@
mkinstalldirs = @mkinstalldirs@
AUTOMAKE_OPTIONS = foreign
gcjdir = $(includedir)/gcj
gcj_HEADERS = array.h cni.h field.h javaprims.h method.h libgcj-config.h
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../include/config.h libgcj-config.h
CONFIG_CLEAN_FILES =
HEADERS = $(gcj_HEADERS)
......
libjava/include/Makefile.in
......@@ -121,11 +121,11 @@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@
here = @here@
libgcj_basedir = @libgcj_basedir@
mkinstalldirs = @mkinstalldirs@
AUTOMAKE_OPTIONS = foreign
include_HEADERS = jni.h jvmpi.h
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = config.h ../gcj/libgcj-config.h
CONFIG_CLEAN_FILES =
HEADERS = $(include_HEADERS)
......
libjava/libltdl/Makefile.in
......@@ -80,16 +80,21 @@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
mkinstalldirs = @mkinstalldirs@
AUTOMAKE_OPTIONS = no-dependencies foreign
INCLUDES = $(GCINCS)
@INSTALL_LTDL_TRUE@include_HEADERS = ltdl.h
@INSTALL_LTDL_TRUE@lib_LTLIBRARIES = libltdl.la
@INSTALL_LTDL_FALSE@noinst_HEADERS = ltdl.h
@INSTALL_LTDL_TRUE@include_HEADERS = \
@INSTALL_LTDL_TRUE@ltdl.h
@INSTALL_LTDL_TRUE@lib_LTLIBRARIES = \
@INSTALL_LTDL_TRUE@libltdl.la
@INSTALL_LTDL_FALSE@noinst_HEADERS = \
@INSTALL_LTDL_FALSE@ltdl.h
@CONVENIENCE_LTDL_TRUE@noinst_LTLIBRARIES = libltdlc.la
@CONVENIENCE_LTDL_TRUE@noinst_LTLIBRARIES = \
@CONVENIENCE_LTDL_TRUE@libltdlc.la
libltdl_la_SOURCES = ltdl.c
libltdl_la_LDFLAGS = -no-undefined -version-info 2:0:2
......@@ -98,7 +103,6 @@ libltdl_la_LIBADD = $(LIBADD_DL)
libltdlc_la_SOURCES = ltdl.c
libltdlc_la_LIBADD = $(LIBADD_DL)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
......@@ -127,7 +131,7 @@ configure.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
TAR = tar
GZIP_ENV = --best
SOURCES = $(libltdl_la_SOURCES) $(libltdlc_la_SOURCES)
OBJECTS = $(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS)
......@@ -347,7 +351,7 @@ distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \
cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
......
libjava/testsuite/Makefile.in
......@@ -121,6 +121,7 @@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@
here = @here@
libgcj_basedir = @libgcj_basedir@
mkinstalldirs = @mkinstalldirs@
AUTOMAKE_OPTIONS = foreign dejagnu
......@@ -136,7 +137,6 @@ RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \
RUNTESTFLAGS = @AM_RUNTESTFLAGS@
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../include/config.h ../gcj/libgcj-config.h
CONFIG_CLEAN_FILES =
DIST_COMMON = ChangeLog Makefile.am Makefile.in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment