diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2011-04-26 18:41:01 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2011-04-26 18:41:01 (GMT) |
| commit | 64c9d25f74a049658c5b5551b33721a6a101c281 (patch) | |
| tree | 7f2b7039c22360f4fa8bc072d3b61e5eef78d73d /hl/examples | |
| parent | 0a71144a4f4216b18b63834da43057234bf0643a (diff) | |
| download | hdf5-64c9d25f74a049658c5b5551b33721a6a101c281.zip hdf5-64c9d25f74a049658c5b5551b33721a6a101c281.tar.gz hdf5-64c9d25f74a049658c5b5551b33721a6a101c281.tar.bz2 | |
[svn-r20640] Remove export from "export LD_LIBRARY_PATH=${LL_PATH}" in examples and hl/examples Makefiles.
"export" breaks make install in Daily Tests on FreeBSD machines and isn't missed elsewhere.
Tested on amani, freedom, jam, heiwa, and loyalty.
Diffstat (limited to 'hl/examples')
| -rw-r--r-- | hl/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/examples/Makefile.in | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am index d1f67bc..ae65a3b 100644 --- a/hl/examples/Makefile.am +++ b/hl/examples/Makefile.am @@ -91,8 +91,8 @@ ex_table10: $(srcdir)/ex_table10.c ex_table11: $(srcdir)/ex_table11.c ex_table12: $(srcdir)/ex_table12.c -if BUILD_SZIP_CONDITIONAL -export LD_LIBRARY_PATH=$(LL_PATH) +if BUILD_SHARED_SZIP_CONDITIONAL +LD_LIBRARY_PATH=$(LL_PATH) endif include $(top_srcdir)/config/examples.am diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 7a3819a..e4de89e 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -387,6 +387,7 @@ INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c ptExampleVL.c \ INSTALL_SCRIPT_FILES = run-hlc-ex.sh INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh +@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH) # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. @@ -651,8 +652,6 @@ ex_table10: $(srcdir)/ex_table10.c ex_table11: $(srcdir)/ex_table11.c ex_table12: $(srcdir)/ex_table12.c -@BUILD_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH) - # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ |