summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2011-04-26 18:41:01 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2011-04-26 18:41:01 (GMT)
commit64c9d25f74a049658c5b5551b33721a6a101c281 (patch)
tree7f2b7039c22360f4fa8bc072d3b61e5eef78d73d /examples
parent0a71144a4f4216b18b63834da43057234bf0643a (diff)
downloadhdf5-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 'examples')
-rw-r--r--examples/Makefile.am4
-rw-r--r--examples/Makefile.in3
2 files changed, 3 insertions, 4 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8a428ae..9ec6a85 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -97,8 +97,8 @@ h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS)
h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS)
h5_shared_mesg: $(srcdir)/h5_shared_mesg.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/examples/Makefile.in b/examples/Makefile.in
index 6c03f02..90e9bff 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -388,6 +388,7 @@ EXTLINK_DIRS = red blue u2w
# Note: no '/' after DESTDIR. Explanation in commence.am
EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c
EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples
+@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.
@@ -657,8 +658,6 @@ h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS)
h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS)
h5_shared_mesg: $(srcdir)/h5_shared_mesg.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 $@