Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (TESTS_ENVIRONMENT): New macro.

From-SVN: r40568

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 2ae9240ed32391b5c0112d264396c5675f5f1479..b653356e6aef95d02fda23aaeb52707732bac519 100644 (file)
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,12 @@
+2001-03-16  Tom Tromey  <tromey@redhat.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (TESTS_ENVIRONMENT): New macro.
+
+2001-01-23  Rod Stewart <stewart@lab43.org>
+
+       * gcconfig.h: Check for `__arm__', not `arm'.
+
 2000-12-30  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * configure.in: Rename THREADLIB to THREADLIBS.

diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index 06d740b15af8b4464839618da1b5a7d8d05e61c3..83bade1d98f26d318e7406c7f2761eb7eaa25ce4 100644 (file)
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -50,6 +50,7 @@ check_PROGRAMS = gctest
 gctest_SOURCES = test.c
 gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
 
+TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
 TESTS = gctest
 
 ## FIXME: relies on internal code generated by automake.

diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index ec91baa62df29c004af4800077c573c4bef4e303..2439ce7d4c191494a1fa9e5bfce0532f3bc5143c 100644 (file)
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -102,9 +102,12 @@ MULTIDIRS =
 MULTISUBDIR = 
 MULTIDO = true
 MULTICLEAN = true
-@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
-@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
+@USE_LIBDIR_TRUE@toolexeclibdir = \
+@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexeclibdir = \
+@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
+@USE_LIBDIR_FALSE@toolexecdir = \
+@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
 
 toolexeclib_LTLIBRARIES = $(target_all)
 EXTRA_LTLIBRARIES = libgcjgc.la
@@ -136,6 +139,7 @@ check_PROGRAMS = gctest
 gctest_SOURCES = test.c
 gctest_LDADD = ./libgcjgc.la $(THREADLIBS) $(EXTRA_TEST_LIBS)
 
+TESTS_ENVIRONMENT = LD_LIBRARY_PATH=../../$(MULTIBUILDTOP)gcc
 TESTS = gctest
 
 all_objs = @addobjs@ $(libgcjgc_la_OBJECTS)
@@ -406,7 +410,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          if test -f $$file; then d=.; else d=$(srcdir); fi; \
          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 \