summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-07-21 14:49:09 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-07-21 14:49:09 (GMT)
commit892ccb28fbf37b196dfea9043b09b1dae8e8d501 (patch)
treebdc5f540280cd7587b6c2e5f1a4a4b0378053a0d /hl
parent9dfeb4020c7a4c4cf384899d3768440078b266b9 (diff)
downloadhdf5-892ccb28fbf37b196dfea9043b09b1dae8e8d501.zip
hdf5-892ccb28fbf37b196dfea9043b09b1dae8e8d501.tar.gz
hdf5-892ccb28fbf37b196dfea9043b09b1dae8e8d501.tar.bz2
Examples DESTDIR and github action
Diffstat (limited to 'hl')
-rw-r--r--hl/c++/examples/Makefile.am4
-rw-r--r--hl/examples/Makefile.am4
-rw-r--r--hl/fortran/examples/Makefile.am4
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