diff options
| author | Roland McGrath <[email protected]> | 2011-03-03 10:48:51 -0800 |
|---|---|---|
| committer | Roland McGrath <[email protected]> | 2011-03-03 10:48:51 -0800 |
| commit | c32696c64df869011d3a9a03c824835222cef3f9 (patch) | |
| tree | 9e05dcb22e03f5cb4040f992d7e32cf8c00ab2fc | |
| parent | fec3999dc82e340bdcb41aefca2793f0b10cb825 (diff) | |
| parent | 58cfa1c78f45459ad2b5cc9b58b052f44054a9e7 (diff) | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/elfutils
| -rw-r--r-- | tests/ChangeLog | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 16eb7d5f..b0796774 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -3,6 +3,10 @@ * Makefile.am (TESTS): Add run-readelf-twofiles.sh. * run-readelf-twofiles.sh: New file. +2011-02-25 Mark Wielaard <[email protected]> + + * Makefile.am (BUILD_RPATH): Be consistent in naming. + 2011-02-02 Josh Stone <[email protected]> * run-prelink-addr-test.sh: Add testfile55, 32 and 64-bit. diff --git a/tests/Makefile.am b/tests/Makefile.am index dcdc0d8e..d0e42465 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/config/eu.am if MUDFLAP BUILD_RPATH = \$$ORIGIN/../backends else -BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf +BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf endif AM_LDFLAGS = @@ -42,7 +42,7 @@ AM_LDFLAGS += -Wl,-rpath-link,../libasm:../libdw:../libelf endif if TESTS_RPATH -AM_LDFLAGS += -Wl,-rpath,$(BUILT_RPATH) +AM_LDFLAGS += -Wl,-rpath,$(BUILD_RPATH) tests_rpath = yes else tests_rpath = no |