diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-06-16 13:59:55 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-06-16 13:59:55 (GMT) |
| commit | d20000ec51d50b66fc1226eeb656b8dc1358f826 (patch) | |
| tree | 93a9038c8adc0ac79378fb8543ae45f1045adbd1 /hl | |
| parent | b718bf567f5ccd649a4d3153276f47a56ee0d939 (diff) | |
| parent | 4cebd8aa6c965fe2e5dde6dbff36b2be3ca58bf1 (diff) | |
| download | hdf5-d20000ec51d50b66fc1226eeb656b8dc1358f826.zip hdf5-d20000ec51d50b66fc1226eeb656b8dc1358f826.tar.gz hdf5-d20000ec51d50b66fc1226eeb656b8dc1358f826.tar.bz2 | |
Merge pull request #2610 in HDFFV/hdf5 from ~DYOUNG/werror:hdffv-11060-examples-destdir to develop
* commit '4cebd8aa6c965fe2e5dde6dbff36b2be3ca58bf1':
Make examples installation respect DESTDIR. Fixes HDFFV-11060.
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/examples/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/fortran/examples/Makefile.am | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am index 592e8da..7234bfc 100644 --- a/hl/c++/examples/Makefile.am +++ b/hl/c++/examples/Makefile.am @@ -33,8 +33,8 @@ CXX_API=yes # Where to install examples # Note: no '/' after DESTDIR. Explanation in commence.am -EXAMPLEDIR=$(examplesdir)/hl/c++ -EXAMPLETOPDIR=$(examplesdir)/hl +EXAMPLEDIR=${DESTDIR}$(examplesdir)/hl/c++ +EXAMPLETOPDIR=${DESTDIR}$(examplesdir)/hl # How to build programs using h5c++ $(EXTRA_PROG): $(H5CPP) diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am index cc2d671..c9d90dd 100644 --- a/hl/examples/Makefile.am +++ b/hl/examples/Makefile.am @@ -25,8 +25,8 @@ endif # Example directory # Note: no '/' after DESTDIR. Explanation in commence.am -EXAMPLEDIR=$(examplesdir)/hl/c -EXAMPLETOPDIR=$(examplesdir)/hl +EXAMPLEDIR=${DESTDIR}$(examplesdir)/hl/c +EXAMPLETOPDIR=${DESTDIR}$(examplesdir)/hl INSTALL_SCRIPT_FILES = run-hlc-ex.sh INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am index b81cc6f..32f279c 100644 --- a/hl/fortran/examples/Makefile.am +++ b/hl/fortran/examples/Makefile.am @@ -51,8 +51,8 @@ endif # Tell automake how to install examples # Note: no '/' after DESTDIR. Explanation in commence.am -EXAMPLEDIR=$(examplesdir)/hl/fortran -EXAMPLETOPDIR=$(examplesdir)/hl +EXAMPLEDIR=${DESTDIR}$(examplesdir)/hl/fortran +EXAMPLETOPDIR=${DESTDIR}$(examplesdir)/hl # List dependencies for each example. Normally, automake would take # care of this for us, but if we tell automake about the programs it |