summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-07-21 15:39:46 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-07-21 15:39:46 (GMT)
commit0ee5d676210291f784ce273ee34b1a7d383ec694 (patch)
treebdc5f540280cd7587b6c2e5f1a4a4b0378053a0d
parent9dfeb4020c7a4c4cf384899d3768440078b266b9 (diff)
parent892ccb28fbf37b196dfea9043b09b1dae8e8d501 (diff)
downloadhdf5-0ee5d676210291f784ce273ee34b1a7d383ec694.zip
hdf5-0ee5d676210291f784ce273ee34b1a7d383ec694.tar.gz
hdf5-0ee5d676210291f784ce273ee34b1a7d383ec694.tar.bz2
Merge pull request #2705 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10
* commit '892ccb28fbf37b196dfea9043b09b1dae8e8d501': Examples DESTDIR and github action
-rw-r--r--.github/workflows/main.yml4
-rw-r--r--c++/examples/Makefile.am4
-rw-r--r--examples/Makefile.am4
-rw-r--r--fortran/examples/Makefile.am4
-rw-r--r--hl/c++/examples/Makefile.am4
-rw-r--r--hl/examples/Makefile.am4
-rw-r--r--hl/fortran/examples/Makefile.am4
7 files changed, 14 insertions, 14 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a3fdadb..60e21c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,8 +4,8 @@ name: hdf5 dev CI
on:
push:
branches: [ develop, hdf5_1_12, hdf5_1_10, hdf5_1_8 ]
-# pull_request:
-# branches: [ develop ]
+ pull_request:
+ branches: [ develop, hdf5_1_12, hdf5_1_10, hdf5_1_8 ]
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index 0648504..cbec8f8 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@@ -49,8 +49,8 @@ CXX_API=yes
# Where to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR=$(examplesdir)/c++
-EXAMPLETOPDIR=$(examplesdir)
+EXAMPLEDIR=${DESTDIR}$(examplesdir)/c++
+EXAMPLETOPDIR=${DESTDIR}$(examplesdir)
# How to build programs using h5c++
$(EXTRA_PROG): $(H5CPP)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 582fb5d..12ec52a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -84,8 +84,8 @@ CHECK_CLEANFILES+=$(EXTLINK_DIRS)
# Example directory
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR=$(examplesdir)/c
-EXAMPLETOPDIR=$(examplesdir)
+EXAMPLEDIR=${DESTDIR}$(examplesdir)/c
+EXAMPLETOPDIR=${DESTDIR}$(examplesdir)
# List dependencies for each program. Normally, automake would take
# care of this for us, but if we tell automake about the programs it
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index fb510bc..474126d 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -74,8 +74,8 @@ endif
# Tell automake how to install examples
# Note: no '/' after DESTDIR. Explanation in commence.am
-EXAMPLEDIR=$(examplesdir)/fortran
-EXAMPLETOPDIR=$(examplesdir)
+EXAMPLEDIR=${DESTDIR}$(examplesdir)/fortran
+EXAMPLETOPDIR=${DESTDIR}$(examplesdir)
# List dependencies for each example. Normally, automake would take
# care of this for us, but if we tell automake about the programs it
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