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 /hl/tools | |
| 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.
Diffstat (limited to 'hl/tools')
| -rw-r--r-- | hl/tools/Makefile.in | 10 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 10 |
2 files changed, 10 insertions, 10 deletions
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. |