diff options
| author | Xavier Roche <xroche@users.noreply.github.com> | 2013-06-03 19:37:06 +0000 |
|---|---|---|
| committer | Xavier Roche <xroche@users.noreply.github.com> | 2013-06-03 19:37:06 +0000 |
| commit | ad073625e6f9c4695511be8cae7efb727830c3d5 (patch) | |
| tree | ca3b38ce59c366b7d188f47b650873155b2a03de /tests | |
| parent | f37aa98097f82045a0ac3087c9876054f55e5609 (diff) | |
Propagate $lt_cv_objdir not to use directly .libs (would break on WIN32)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/Makefile.in | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ffd05bb..5a076f6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh TESTS_ENVIRONMENT = -TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/.libs$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" -TESTS_ENVIRONMENT += PATH=$(top_builddir)/src/.libs:$$PATH +TESTS_ENVIRONMENT += $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" +TESTS_ENVIRONMENT += PATH=$(top_builddir)/src/$(LT_CV_OBJDIR):$$PATH TESTS = *.test diff --git a/tests/Makefile.in b/tests/Makefile.in index c8164bd..eb2ffe8 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -98,6 +98,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_CV_OBJDIR = @LT_CV_OBJDIR@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ @@ -179,8 +180,8 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ EXTRA_DIST = $(TESTS) crawl-test.sh run-all-tests.sh -TESTS_ENVIRONMENT = $(SHLIBPATH_VAR)="$(top_builddir)/src/.libs$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" \ - PATH=$(top_builddir)/src/.libs:$$PATH +TESTS_ENVIRONMENT = $(SHLIBPATH_VAR)="$(top_builddir)/src/$(LT_CV_OBJDIR)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" \ + PATH=$(top_builddir)/src/$(LT_CV_OBJDIR):$$PATH TESTS = *.test all: all-am |