diff options
| -rw-r--r-- | fortran/src/Makefile.am | 8 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 8 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 4 | ||||
| -rw-r--r-- | tools/misc/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/misc/Makefile.in | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index 2f8e841..6da0883 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -89,20 +89,20 @@ clean-local: install-data-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ + $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ fi uninstall-local: @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ - set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ + set -x; $(RM) $(DESTDIR)$(includedir)/*.$(F9XMODEXT); \ fi; \ fi; \ - $(RM) $(bindir)/$(H5FC_NAME) + $(RM) $(DESTDIR)$(bindir)/$(H5FC_NAME) # Also install and uninstall (uninstall-local above) h5fc script install-exec-local: - @$(INSTALL) h5fc $(bindir)/$(H5FC_NAME) + @$(INSTALL) h5fc $(DESTDIR)$(bindir)/$(H5FC_NAME) # Install libhdf5_fortran.settings in lib directory settingsdir=$(libdir) diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 29299e2..8c4d5ab 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -864,20 +864,20 @@ clean-local: install-data-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ + $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ fi uninstall-local: @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ - set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ + set -x; $(RM) $(DESTDIR)$(includedir)/*.$(F9XMODEXT); \ fi; \ fi; \ - $(RM) $(bindir)/$(H5FC_NAME) + $(RM) $(DESTDIR)$(bindir)/$(H5FC_NAME) # Also install and uninstall (uninstall-local above) h5fc script install-exec-local: - @$(INSTALL) h5fc $(bindir)/$(H5FC_NAME) + @$(INSTALL) h5fc $(DESTDIR)$(bindir)/$(H5FC_NAME) #Specify what Automake needs to create: first the H5fort_type_defines.h # header, then H5match_types which includes that header, then diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index 0285412..6bf010b 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -57,12 +57,12 @@ clean-local: install-data-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ + $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ fi 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 -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(includedir)/HDF5.$(F9XMODEXT)"; then \ set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ fi; \ fi diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 7d3c3b8..7f29cc1 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -699,12 +699,12 @@ clean-local: install-data-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \ + $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ fi 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 -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(includedir)/HDF5.$(F9XMODEXT)"; then \ set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ fi; \ fi diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am index 46dd8b7..bf180f8 100644 --- a/tools/misc/Makefile.am +++ b/tools/misc/Makefile.am @@ -58,9 +58,9 @@ else endif install-exec-local: - @$(INSTALL) h5cc $(bindir)/$(H5CC_NAME) + @$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME) uninstall-local: - @$(RM) $(bindir)/$(H5CC_NAME) + @$(RM) $(DESTDIR)$(bindir)/$(H5CC_NAME) # How to build h5redeploy script h5redeploy: h5redeploy.in diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 364762b..72b5c34 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -749,9 +749,9 @@ help: @$(top_srcdir)/bin/makehelp install-exec-local: - @$(INSTALL) h5cc $(bindir)/$(H5CC_NAME) + @$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME) uninstall-local: - @$(RM) $(bindir)/$(H5CC_NAME) + @$(RM) $(DESTDIR)$(bindir)/$(H5CC_NAME) # How to build h5redeploy script h5redeploy: h5redeploy.in |