diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-17 01:01:29 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-17 01:01:29 +0000 |
| commit | 5bb9e93621f3f5e463b782609b7af396283cb19a (patch) | |
| tree | cc0c345f238613141985e768dc73326a3e7a4256 /boehm-gc | |
| parent | 578b26e379972422cc538d90e9191863fd69567c (diff) | |
| download | gcc-5bb9e93621f3f5e463b782609b7af396283cb19a.tar.gz | |
* Makefile.in: Rebuilt.
* Makefile.am (TESTS_ENVIRONMENT): New macro.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40568 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc')
| -rw-r--r-- | boehm-gc/ChangeLog | 9 | ||||
| -rw-r--r-- | boehm-gc/Makefile.am | 1 | ||||
| -rw-r--r-- | boehm-gc/Makefile.in | 12 |
3 files changed, 18 insertions, 4 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 2ae9240ed32..b653356e6ae 100644 --- 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 06d740b15af..83bade1d98f 100644 --- 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 ec91baa62df..2439ce7d4c1 100644 --- 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 \ |