diff options
| author | rhaas <rhaas@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2013-02-21 04:23:40 +0000 |
|---|---|---|
| committer | rhaas <rhaas@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2013-02-21 04:23:40 +0000 |
| commit | f5840788ab7b6c16959158bb4e7b5bf57b7f983a (patch) | |
| tree | 7ce74ab36d866566f27a0a567b453ce03e14ce1e | |
| parent | c92c00708c14f7fa09a34f4579c634350ec2848a (diff) | |
only install those hdf5 utils that we find/could build
only try to install those hdf5 utilities that were eihter build by us or can be
found in HDF5_DIR/bin since eg. a sytem package provides them.
This helps with users that use the system provided hdf5 package but do not
install the hdf5-tools package (package names are Debian names).
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@69 fb53df36-e548-4a1e-8150-ab98cbd5e786
| -rw-r--r-- | src/make.configuration.defn | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/make.configuration.defn b/src/make.configuration.defn index 542e128..ff7d9d6 100644 --- a/src/make.configuration.defn +++ b/src/make.configuration.defn @@ -1,7 +1,9 @@ # make.configuration.defn file for thorn HDF5 -# Define standard HDF5 utilities -ALL_UTILS += gif2h5 h52gif h5copy h5debug h5diff h5dump h5import h5jam h5ls h5mkgrp h5perf_serial h5redeploy h5repack h5repart h5stat h5unjam +# Define standard HDF5 utilities and install those that we could build/that are +# present in the system +STD_HDF5_UTILS = gif2h5 h52gif h5copy h5debug h5diff h5dump h5import h5jam h5ls h5mkgrp h5perf_serial h5redeploy h5repack h5repart h5stat h5unjam +ALL_UTILS += $(shell cd $(HDF5_DIR)/bin; ls 2>/dev/null $(STD_HDF5_UTILS)) # Install h5check only if it exists ifneq ($(wildcard $(HDF5_DIR)/bin/h5check*),) |