diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2010-09-16 22:12:07 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2010-09-16 22:12:07 (GMT) |
| commit | 696675029e4bd3461bc175fb9d9b3406767acbfd (patch) | |
| tree | 127f396203cf7bfc798ae684818aac5ff40fd46c /c++/src/Makefile.in | |
| parent | 6d97ffcc6cec0c23e718da16fcf0f2043df046c5 (diff) | |
| download | hdf5-696675029e4bd3461bc175fb9d9b3406767acbfd.zip hdf5-696675029e4bd3461bc175fb9d9b3406767acbfd.tar.gz hdf5-696675029e4bd3461bc175fb9d9b3406767acbfd.tar.bz2 | |
[svn-r19408] In this revision the '/' after ${DESTDIR} wherever it occurs
has been removed. According to the official description of DESTDIR by Gnu at
http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is
prepended to the normal and complete install path that it precedes for the
purpose of installing in a temporary directory which is useful for building
rpms and other packages. The '/' after ${DESTDIR} will be followed by another
'/' at the beginning of the normal install path. When DESTDIR is empty the
path then begins with '//', which is incorrect and causes problems at least for
Cygwin.
The change made in config/commence.am affects many Makefile.*s when bin/reconfigure
is run. EXAMPLEDIRs had to be corrected individually.
Also the scripts to run examples after they are installed have checks added to see
that the fortran and c++ directories are present before trying to run the scripts
in them.
Tested with h5committest on amani, heiwa and jam.
Diffstat (limited to 'c++/src/Makefile.in')
| -rw-r--r-- | c++/src/Makefile.in | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 686bd51..5898573 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -371,14 +371,24 @@ LIBH5_HL = $(top_builddir)/hl/src/libhdf5_hl.la LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la +# Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below +# has been removed. According to the official description of DESTDIR by Gnu at +# http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is +# prepended to the normal and complete install path that it precedes for the +# purpose of installing in a temporary directory which is useful for building +# rpms and other packages. The '/' after ${DESTDIR} will be followed by another +# '/' at the beginning of the normal install path. When DESTDIR is empty the +# path then begins with '//', which is incorrect and causes problems at least for +# Cygwin. + # Scripts used to build examples # If only shared libraries have been installed, have h5cc build examples with # shared libraries instead of static libraries -H5CC = ${DESTDIR}/$(bindir)/h5cc -H5CC_PP = ${DESTDIR}/$(bindir)/h5pcc -H5FC = ${DESTDIR}/$(bindir)/h5fc -H5FC_PP = ${DESTDIR}/$(bindir)/h5pfc -H5CPP = ${DESTDIR}/$(bindir)/h5c++ +H5CC = ${DESTDIR}$(bindir)/h5cc +H5CC_PP = ${DESTDIR}$(bindir)/h5pcc +H5FC = ${DESTDIR}$(bindir)/h5fc +H5FC_PP = ${DESTDIR}$(bindir)/h5pfc +H5CPP = ${DESTDIR}$(bindir)/h5c++ ACLOCAL_AMFLAGS = "-I m4" # The trace script; this is used on source files from the C library to |