diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2011-04-16 17:52:58 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2011-04-16 17:52:58 (GMT) |
| commit | a99c68f3f9ac16df25d68a06947d92fcd0da220c (patch) | |
| tree | 20d46aff1dc8a78e2b63e4f1632b051226122163 /hl | |
| parent | 94c1e60ea84dfee632ee0d355bada11885ecbed5 (diff) | |
| download | hdf5-a99c68f3f9ac16df25d68a06947d92fcd0da220c.zip hdf5-a99c68f3f9ac16df25d68a06947d92fcd0da220c.tar.gz hdf5-a99c68f3f9ac16df25d68a06947d92fcd0da220c.tar.bz2 | |
[svn-r20534] 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, koala, and loyalty.
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/examples/Makefile.in | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am index fb0045f..ae65a3b 100644 --- a/hl/examples/Makefile.am +++ b/hl/examples/Makefile.am @@ -92,7 +92,7 @@ ex_table11: $(srcdir)/ex_table11.c ex_table12: $(srcdir)/ex_table12.c if BUILD_SHARED_SZIP_CONDITIONAL -export LD_LIBRARY_PATH=$(LL_PATH) +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 5c479ef..dc7133c 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -388,6 +388,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. @@ -652,8 +653,6 @@ ex_table10: $(srcdir)/ex_table10.c ex_table11: $(srcdir)/ex_table11.c ex_table12: $(srcdir)/ex_table12.c -@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH) - # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ |