From: Teemu Ikonen <tpikonen@gmail.com>
Date: Sat, 13 Oct 2018 18:35:54 +0300
Subject: makefile-fix: Get system HDF5 config from pkg-config.

---
 Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c867a9a..ba101dd 100644
--- a/Makefile
+++ b/Makefile
@@ -324,15 +324,19 @@ HDF5LIBS_LOCAL = $(LIB)/libhdf5.a
 HDF5LIBS_SYSTEM = -lz -ldl
 HDF5SOLIBS_LOCAL = -L$(LIB) -lhdf5
 HDF5SOLIBS_SYSTEM = -lz
+HDF5_CFLAGS = -I$(HDF5_PREFIX)/include
 HDF5REGISTER ?= --register plugin
 else
 HDF5 =
 HDF5dep =
 HDF5_INSTALL =
 HDF5LIBS_LOCAL =
-HDF5LIBS_SYSTEM = -L$(HDF5_PREFIX)/lib -lhdf5 -lz -ldl
+#HDF5LIBS_SYSTEM = -L$(HDF5_PREFIX)/lib -lhdf5 -lz -ldl
+HDF5LIBS_SYSTEM = $(shell pkg-config --libs hdf5-serial)
 HDF5SOLIBS_LOCAL =
-HDF5SOLIBS_SYSTEM = -L$(HDF5_PREFIX)/lib -lhdf5 -lz
+#HDF5SOLIBS_SYSTEM = -L$(HDF5_PREFIX)/lib -lhdf5 -lz
+HDF5SOLIBS_SYSTEM = $(shell pkg-config --libs hdf5-serial)
+HDF5_CFLAGS = $(shell pkg-config --cflags hdf5-serial)
 HDF5REGISTER ?= --register manual
 endif
 H5DUMP = $(HDF5_PREFIX)/bin/h5dump
@@ -614,7 +618,7 @@ BSHUFURL    = http://downloads.sf.net/cbflib/$(BSHUF).tar.gz
 #
 # Include directories
 #
-INCLUDES = -I$(INCLUDE) -I$(SRC) -I$(HDF5_PREFIX)/include
+INCLUDES = -I$(INCLUDE) -I$(SRC) $(HDF5_CFLAGS)
 
 #
 # runtime library path export commands
