diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2008-10-08 05:17:05 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2008-10-08 05:17:05 (GMT) |
| commit | 73bf21ce054cd67bf895bcab462d7b3e9c0bc996 (patch) | |
| tree | c058610cdbe8d810fd07a5919ea1f8d7ceca2fcc /hl | |
| parent | f1e2853e6f252c99d7a55c59f4611f9d2f82975b (diff) | |
| download | hdf5-73bf21ce054cd67bf895bcab462d7b3e9c0bc996.zip hdf5-73bf21ce054cd67bf895bcab462d7b3e9c0bc996.tar.gz hdf5-73bf21ce054cd67bf895bcab462d7b3e9c0bc996.tar.bz2 | |
[svn-r15812] Bug fix: #1090
The custom rules for installing h5cc, h5fc, and the fortran modules in fortran
and in hl/fortran don't use $(DESTDIR). Added it to all those rules.
Tested: kagiso both serial and parallel with fortran and cxx enabled.
Tested by:
make install
make DESTDIR=/tmp/acheng install
diff -r /tmp/acheng/.../hdf5 hdf5
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/fortran/src/Makefile.am | 4 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 4 |
2 files changed, 4 insertions, 4 deletions
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 |