diff options
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/Makefile.in | 10 | ||||
-rw-r--r-- | fortran/examples/Makefile.am | 2 | ||||
-rw-r--r-- | fortran/examples/Makefile.in | 12 | ||||
-rwxr-xr-x | fortran/examples/testh5fc.sh.in | 2 | ||||
-rw-r--r-- | fortran/src/Makefile.am | 4 | ||||
-rw-r--r-- | fortran/src/Makefile.in | 14 | ||||
-rw-r--r-- | fortran/test/Makefile.in | 10 | ||||
-rw-r--r-- | fortran/testpar/Makefile.in | 10 |
8 files changed, 32 insertions, 32 deletions
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. |