From 32d89e04551fde732bec188f87b2eae8d5706f72 Mon Sep 17 00:00:00 2001 From: tromey Date: Sat, 17 Mar 2001 01:01:29 +0000 Subject: [PATCH] * 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 --- ChangeLog | 9 +++++++++ Makefile.am | 1 + Makefile.in | 12 ++++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ae9240e..b653356e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-03-16 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (TESTS_ENVIRONMENT): New macro. + +2001-01-23 Rod Stewart + + * gcconfig.h: Check for `__arm__', not `arm'. + 2000-12-30 Bryce McKinlay * configure.in: Rename THREADLIB to THREADLIBS. diff --git a/Makefile.am b/Makefile.am index 06d740b1..83bade1d 100644 --- a/Makefile.am +++ b/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/Makefile.in b/Makefile.in index ec91baa6..2439ce7d 100644 --- a/Makefile.in +++ b/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 \ -- 2.40.0