6 files changed, 64 insertions, 18 deletions
diff --git a/science/hdf/files/patch-hdf-examples-Makefile.in b/science/hdf/files/patch-hdf-examples-Makefile.in
new file mode 100644
index 000000000000..85f4a1451715
--- /dev/null
+++ b/science/hdf/files/patch-hdf-examples-Makefile.in
@@ -0,0 +1,13 @@
+--- hdf/examples/Makefile.in.orig	2015-02-10 00:43:49.000000000 +0800
++++ hdf/examples/Makefile.in	2015-03-16 23:05:52.348877136 +0800
+@@ -530,8 +530,8 @@
+ INSTALL_TOP_FILES = README
+ 
+ # Where to install example files
+-EXAMPLEDIR = $(prefix)/examples/c
+-EXAMPLETOPDIR = $(prefix)/examples
++EXAMPLEDIR = $(DESTDIR)$(prefix)/share/examples/hdf/c
++EXAMPLETOPDIR = $(DESTDIR)$(prefix)/share/examples/hdf
+ DISTCLEANFILES = *.chkexe *.chklog
+ @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
+ 
diff --git a/science/hdf/files/patch-hdf-fortran-examples-Makefile.in b/science/hdf/files/patch-hdf-fortran-examples-Makefile.in
new file mode 100644
index 000000000000..5a3e51d42b56
--- /dev/null
+++ b/science/hdf/files/patch-hdf-fortran-examples-Makefile.in
@@ -0,0 +1,11 @@
+--- hdf/fortran/examples/Makefile.in.orig	2015-02-10 00:43:49.000000000 +0800
++++ hdf/fortran/examples/Makefile.in	2015-03-16 23:41:52.776730245 +0800
+@@ -525,7 +525,7 @@
+ INSTALL_SCRIPT_FILES = run-fortran-ex.sh
+ 
+ # Where to install Fortran example files
+-EXAMPLEDIR = $(prefix)/examples/fortran
++EXAMPLEDIR = $(DESTDIR)$(prefix)/share/hdf/examples/fortran
+ DISTCLEANFILES = *.chkexe *.chklog
+ @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
+ 
diff --git a/science/hdf/files/patch-hdf__src__Makefile.in b/science/hdf/files/patch-hdf-src-Makefile.in
index 2e2a080ebc0d..64cd97670426 100644
--- a/science/hdf/files/patch-hdf__src__Makefile.in
+++ b/science/hdf/files/patch-hdf-src-Makefile.in
@@ -1,6 +1,6 @@
---- hdf/src/Makefile.in.orig	2012-08-07 13:11:36.000000000 +0900
-+++ hdf/src/Makefile.in	2012-08-14 21:08:53.000000000 +0900
-@@ -187,7 +187,7 @@
+--- hdf/src/Makefile.in.orig	2015-02-10 00:43:49.000000000 +0800
++++ hdf/src/Makefile.in	2015-03-16 23:48:46.316696873 +0800
+@@ -296,7 +296,7 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LD = @LD@
@@ -9,12 +9,12 @@
  LEX = @LEX@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -290,8 +290,6 @@
- CP = cp
- H4CC = $(bindir)/h4cc
- H4FC = $(bindir)/h4fc
+@@ -408,8 +408,6 @@
+ LIBMFHDF = $(top_builddir)/mfhdf/libsrc/libmfhdf.la
+ H4CC = ${DESTDIR}$(bindir)/h4cc
+ H4FC = ${DESTDIR}$(bindir)/h4fc
 -@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
 -@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs -R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD)
  ACLOCAL_AMFLAGS = "-I m4"
- lib_LTLIBRARIES = libdf.la
- FSOURCES = df24ff.f dfanf.c dfanff.f dff.c dfff.f dfpf.c dfpff.f dfr8f.c    \
+ 
+ # .chkexe files are used to mark tests that have run successfully.
diff --git a/science/hdf/files/patch-mfhdf-examples-Makefile.in b/science/hdf/files/patch-mfhdf-examples-Makefile.in
new file mode 100644
index 000000000000..8fb080a5c523
--- /dev/null
+++ b/science/hdf/files/patch-mfhdf-examples-Makefile.in
@@ -0,0 +1,11 @@
+--- mfhdf/examples/Makefile.in.orig	2015-02-10 00:43:50.000000000 +0800
++++ mfhdf/examples/Makefile.in	2015-03-16 23:43:17.287721940 +0800
+@@ -507,7 +507,7 @@
+ 	SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c        \
+ 	SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
+ 
+-EXAMPLEDIR = $(prefix)/examples/c
++EXAMPLEDIR = $(DESTDIR)$(prefix)/share/examples/hdf/c
+ DISTCLEANFILES = *.chklog *.chkexe .deps
+ @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
+ 
diff --git a/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in b/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in
new file mode 100644
index 000000000000..8687c46b5547
--- /dev/null
+++ b/science/hdf/files/patch-mfhdf-fortran-examples-Makefile.in
@@ -0,0 +1,11 @@
+--- mfhdf/fortran/examples/Makefile.in.orig	2015-02-10 00:43:50.000000000 +0800
++++ mfhdf/fortran/examples/Makefile.in	2015-03-16 23:44:30.846716566 +0800
+@@ -511,7 +511,7 @@
+ 
+ 
+ # Where to install example files
+-EXAMPLEDIR = $(prefix)/examples/fortran
++EXAMPLEDIR = $(DESTDIR)$(prefix)/share/examples/hdf/fortran
+ DISTCLEANFILES = *.chkexe *.chklog
+ @BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH)
+ 
diff --git a/science/hdf/files/patch-mfhdf__libsrc__Makefile.in b/science/hdf/files/patch-mfhdf-libsrc-Makefile.in
index 5d4fb5c78576..e9ca8914a248 100644
--- a/science/hdf/files/patch-mfhdf__libsrc__Makefile.in
+++ b/science/hdf/files/patch-mfhdf-libsrc-Makefile.in
@@ -1,6 +1,6 @@
---- mfhdf/libsrc/Makefile.in.orig	2012-08-07 13:11:12.000000000 +0900
-+++ mfhdf/libsrc/Makefile.in	2012-08-14 21:08:58.000000000 +0900
-@@ -161,7 +161,7 @@
+--- mfhdf/libsrc/Makefile.in.orig	2015-02-10 00:43:51.000000000 +0800
++++ mfhdf/libsrc/Makefile.in	2015-03-16 23:48:46.325704247 +0800
+@@ -272,7 +272,7 @@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  LD = @LD@
@@ -9,12 +9,12 @@
  LEX = @LEX@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
-@@ -264,8 +264,6 @@
- CP = cp
- H4CC = $(bindir)/h4cc
- H4FC = $(bindir)/h4fc
+@@ -384,8 +384,6 @@
+ LIBMFHDF = $(top_builddir)/mfhdf/libsrc/libmfhdf.la
+ H4CC = ${DESTDIR}$(bindir)/h4cc
+ H4FC = ${DESTDIR}$(bindir)/h4fc
 -@HDF_BUILD_XDR_TRUE@XDR_ADD = -R$(abs_top_builddir)/mfhdf/xdr/.libs
 -@HDF_BUILD_SHARED_TRUE@AM_LDFLAGS = -R$(abs_top_builddir)/mfhdf/libsrc/.libs -R$(abs_top_builddir)/hdf/src/.libs $(XDR_ADD)
  ACLOCAL_AMFLAGS = "-I m4"
- INCLUDES = -I$(top_srcdir)/hdf/src        \
-          -I$(top_srcdir)/mfhdf/libsrc   
+ 
+ # .chkexe files are used to mark tests that have run successfully.