diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2010-05-12 20:55:52 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2010-05-12 20:55:52 (GMT) |
| commit | fa416bde84a8c219fa570660bbf3ec8ab16320e7 (patch) | |
| tree | 5430f5c54b5d4a458859f7e9e10723c09e4e7673 | |
| parent | eeeb3937624f7db68680e1074b1154adc780d516 (diff) | |
| download | hdf5-fa416bde84a8c219fa570660bbf3ec8ab16320e7.zip hdf5-fa416bde84a8c219fa570660bbf3ec8ab16320e7.tar.gz hdf5-fa416bde84a8c219fa570660bbf3ec8ab16320e7.tar.bz2 | |
[svn-r18779] Add ${DESTDIR} to scripts and Makefiles so that make DESTDIR=<install directory> install, installcheck and uninstall is supported for installing examples, since they are now installed as part of make install. This was necessary for rpmbuilds, but should also be supported otherwise.
Tested: amani, jam, linew with committest, rpmbuild on jam and amani.
51 files changed, 227 insertions, 221 deletions
diff --git a/Makefile.am b/Makefile.am index 8e1ce4a..4717810 100755 --- a/Makefile.am +++ b/Makefile.am @@ -152,6 +152,9 @@ uninstall-doc: # `make check-install' or `make installcheck' checks that examples can # be successfully built installcheck-local: + if test -n "${DESTDIR}"; then \ + (cd ${DESTDIR}/$(bindir) && pwd && ./h5redeploy -force); \ + fi @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # check-install is just a synonym for installcheck diff --git a/Makefile.in b/Makefile.in index 0a307de..9de00d4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -378,11 +378,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. @@ -976,6 +976,9 @@ uninstall-doc: # `make check-install' or `make installcheck' checks that examples can # be successfully built installcheck-local: + if test -n "${DESTDIR}"; then \ + (cd ${DESTDIR}/$(bindir) && pwd && ./h5redeploy -force); \ + fi @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; # check-install is just a synonym for installcheck diff --git a/c++/Makefile.in b/c++/Makefile.in index 3392766..542929d 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -351,11 +351,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am index 481d75f..28af8d5 100644 --- a/c++/examples/Makefile.am +++ b/c++/examples/Makefile.am @@ -38,7 +38,7 @@ chunks.chkexe_: extend_ds.chkexe_ CXX_API=yes # Where to install examples -EXAMPLEDIR=$(exec_prefix)/examples/c++ +EXAMPLEDIR=${DESTDIR}/$(exec_prefix)/share/hdf5_examples/c++ # How to build programs using h5c++ $(EXTRA_PROG): $(H5CPP) diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index e027b00..db470b0 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -317,11 +317,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. @@ -346,7 +346,7 @@ INSTALL_FILES = create.cpp readdata.cpp writedata.cpp compound.cpp \ CXX_API = yes # Where to install examples -EXAMPLEDIR = $(exec_prefix)/examples/c++ +EXAMPLEDIR = ${DESTDIR}/$(exec_prefix)/share/hdf5_examples/c++ # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. diff --git a/c++/examples/testh5c++.sh.in b/c++/examples/testh5c++.sh.in index 4281e3c..f6c9fd6 100755 --- a/c++/examples/testh5c++.sh.in +++ b/c++/examples/testh5c++.sh.in @@ -25,7 +25,7 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 # Where the tool is installed. -prefix="${prefix:-@prefix@}" +prefix="${prefix:-${DESTDIR}/@prefix@}" AR="@AR@" RANLIB="@RANLIB@" H5TOOL="h5c++" # The tool name diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 68bdb63..9537005 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -373,11 +373,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index def1b05..4b101e4 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -340,11 +340,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/config/commence.am b/config/commence.am index 7085d8f..455a684 100644 --- a/config/commence.am +++ b/config/commence.am @@ -48,11 +48,11 @@ docdir = $(exec_prefix)/doc # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC=$(bindir)/h5cc -H5CC_PP=$(bindir)/h5pcc -H5FC=$(bindir)/h5fc -H5FC_PP=$(bindir)/h5pfc -H5CPP=$(bindir)/h5c++ +H5CC=${DESTDIR}/$(bindir)/h5cc +H5CC_PP=${DESTDIR}/$(bindir)/h5pcc +H5FC=${DESTDIR}/$(bindir)/h5fc +H5FC_PP=${DESTDIR}/$(bindir)/h5pfc +H5CPP=${DESTDIR}/$(bindir)/h5c++ # H5_CFLAGS holds flags that should be used when building hdf5, @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 18710 2010-05-05 17:35:04Z mamcgree . +# From configure.in Id: configure.in 18748 2010-05-10 01:02:02Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for HDF5 1.8.4-snap22. # diff --git a/examples/Makefile.am b/examples/Makefile.am index 94cceae..9143baa 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -65,7 +65,7 @@ $(EXTLINK_DIRS): CHECK_CLEANFILES+=$(EXTLINK_DIRS) # Example directory -EXAMPLEDIR=$(exec_prefix)/examples/c +EXAMPLEDIR=${DESTDIR}/$(exec_prefix)/share/hdf5_examples/c # 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/examples/Makefile.in b/examples/Makefile.in index f1cd97a..8e556e9 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -317,11 +317,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. @@ -356,7 +356,7 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c \ EXTLINK_DIRS = red blue u2w # Example directory -EXAMPLEDIR = $(exec_prefix)/examples/c +EXAMPLEDIR = ${DESTDIR}/$(exec_prefix)/share/hdf5_examples/c # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. diff --git a/examples/testh5cc.sh.in b/examples/testh5cc.sh.in index 0e2b851..16505c2 100755 --- a/examples/testh5cc.sh.in +++ b/examples/testh5cc.sh.in @@ -29,7 +29,7 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 # Where the tool is installed. -prefix="${prefix:-@prefix@}" +prefix="${prefix:-${DESTDIR}/@prefix@}" PARALLEL=@PARALLEL@ # Am I in parallel mode? AR="@AR@" RANLIB="@RANLIB@" diff --git a/fortran/Makefile.in b/fortran/Makefile.in index fb34cef..a7bd000 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -355,11 +355,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am index bb3be1a..5d03d2a 100644 --- a/fortran/examples/Makefile.am +++ b/fortran/examples/Makefile.am @@ -64,7 +64,7 @@ $(EXTRA_PROG): $(H5FC) endif # Tell automake how to install examples -EXAMPLEDIR=$(exec_prefix)/examples/fortran +EXAMPLEDIR=${DESTDIR}/$(exec_prefix)/share/hdf5_examples/fortran # 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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index aa67d82..05ebe21 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -317,11 +317,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. @@ -357,7 +357,7 @@ INSTALL_FILES = dsetexample.f90 fileexample.f90 rwdsetexample.f90 \ FORTRAN_API = yes # Tell automake how to install examples -EXAMPLEDIR = $(exec_prefix)/examples/fortran +EXAMPLEDIR = ${DESTDIR}/$(exec_prefix)/share/hdf5_examples/fortran # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. diff --git a/fortran/examples/testh5fc.sh.in b/fortran/examples/testh5fc.sh.in index 234d4e2..8228ca6 100755 --- a/fortran/examples/testh5fc.sh.in +++ b/fortran/examples/testh5fc.sh.in @@ -25,7 +25,7 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 # Where the tool is installed. -prefix="${prefix:-@prefix@}" +prefix="${prefix:-${DESTDIR}/@prefix@}" PARALLEL=@PARALLEL@ # Am I in parallel mode? AR="@AR@" RANLIB="@RANLIB@" diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index f38e94f..ca938c8 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -100,8 +100,8 @@ install-data-local: $(CP) $(top_srcdir)/fortran/src/H5f90i.h $(DESTDIR)$(includedir)/. uninstall-local: - @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ - if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ + @if test -n "$(DESTDIR)$(F9XMODEXT)" -a "X$(DESTDIR)$(F9XMODEXT)" != "Xo"; then \ + if test -f "$(DESTDIR)$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(includedir)/HDF5.$(F9XMODEXT)"; then \ set -x; $(RM) $(DESTDIR)$(includedir)/*.$(F9XMODEXT); \ fi; \ fi; \ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 3c133c1..b94bce4 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -407,11 +407,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. @@ -927,8 +927,8 @@ install-data-local: $(CP) $(top_srcdir)/fortran/src/H5f90i.h $(DESTDIR)$(includedir)/. uninstall-local: - @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ - if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ + @if test -n "$(DESTDIR)$(F9XMODEXT)" -a "X$(DESTDIR)$(F9XMODEXT)" != "Xo"; then \ + if test -f "$(DESTDIR)$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(includedir)/HDF5.$(F9XMODEXT)"; then \ set -x; $(RM) $(DESTDIR)$(includedir)/*.$(F9XMODEXT); \ fi; \ fi; \ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index c0c0112..36bb6c9 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -388,11 +388,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 613a41a..a0574fa 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -341,11 +341,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/Makefile.in b/hl/Makefile.in index 6b4966a..91c9db0 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -355,11 +355,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index c5ba7b7..973e156 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -351,11 +351,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 7c126f6..1efcb60 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -317,11 +317,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index dc5099c..80323da 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -363,11 +363,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 336e05f..acb7a6a 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -337,11 +337,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am index 6e5afe4..4a9bdbe 100644 --- a/hl/examples/Makefile.am +++ b/hl/examples/Makefile.am @@ -26,7 +26,7 @@ if BUILD_PARALLEL_CONDITIONAL endif # Example directory -EXAMPLEDIR=$(exec_prefix)/examples/hl/c +EXAMPLEDIR=${DESTDIR}/$(exec_prefix)/share/hdf5_examples/hl/c # Example programs. # Don't tell automake about them, because if it knew they were programs, diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index ed4bfc3..722e8ef 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -317,11 +317,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. @@ -334,7 +334,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = # Example directory -EXAMPLEDIR = $(exec_prefix)/examples/hl/c +EXAMPLEDIR = ${DESTDIR}/$(exec_prefix)/share/hdf5_examples/hl/c # Example programs. # Don't tell automake about them, because if it knew they were programs, diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 1dca7ca..04a3d29 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -355,11 +355,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 0211c21..f5aece9 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -317,11 +317,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 1c1cf89..149d9cb 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -372,11 +372,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 5c5f76c..89a87eb 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -346,11 +346,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 2a3f891..d657ba1 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -363,11 +363,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 7222efb..f046110 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -367,11 +367,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index dbe71b5..fdb8568 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -352,11 +352,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 2cd7b40..22e756e 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -352,11 +352,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/perform/Makefile.in b/perform/Makefile.in index b9f5861..9708131 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -388,11 +388,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/src/Makefile.in b/src/Makefile.in index ff74368..21c825a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -422,11 +422,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/test/Makefile.in b/test/Makefile.in index b3b9097..4f06c22 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -634,11 +634,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/testpar/Makefile.in b/testpar/Makefile.in index fa807e4..80aa555 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -361,11 +361,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/Makefile.in b/tools/Makefile.in index 0501d3b..dce6c88 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -352,11 +352,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index d38a4a6..38b109e 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -344,11 +344,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 140f040..19298ff 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -351,11 +351,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 42aa116..82bed31 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -349,11 +349,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index a9c97c3..97f863f 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -344,11 +344,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 9afeceb..20bedf4 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -358,11 +358,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 005250b..648edf8 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -338,11 +338,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index a23e921..c099bf5 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -358,11 +358,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 6396735..e62f5d6 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -367,11 +367,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 60106ae..57db218 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -337,11 +337,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 92e6e6f..f4501d5 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -392,11 +392,11 @@ LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = $(bindir)/h5cc -H5CC_PP = $(bindir)/h5pcc -H5FC = $(bindir)/h5fc -H5FC_PP = $(bindir)/h5pfc -H5CPP = $(bindir)/h5c++ +H5CC = ${DESTDIR}/$(bindir)/h5cc +H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc +H5FC = ${DESTDIR}/$(bindir)/h5fc +H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc +H5CPP = ${DESTDIR}/$(bindir)/h5c++ # The trace script; this is used on source files from the C library to # insert tracing macros. |