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 /examples | |
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 'examples')
-rw-r--r-- | examples/Makefile.am | 2 | ||||
-rw-r--r-- | examples/Makefile.in | 12 | ||||
-rwxr-xr-x | examples/testh5cc.sh.in | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 94cceae..9143baa 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -65,7 +65,7 @@ $(EXTLINK_DIRS): CHECK_CLEANFILES+=$(EXTLINK_DIRS) # Example directory -EXAMPLEDIR=$(exec_prefix)/examples/c +EXAMPLEDIR=${DESTDIR}/$(exec_prefix)/share/hdf5_examples/c # List dependencies for each program. Normally, automake would take # care of this for us, but if we tell automake about the programs it diff --git a/examples/Makefile.in b/examples/Makefile.in index f1cd97a..8e556e9 100644 --- a/examples/Makefile.in +++ b/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. @@ -356,7 +356,7 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c \ EXTLINK_DIRS = red blue u2w # Example directory -EXAMPLEDIR = $(exec_prefix)/examples/c +EXAMPLEDIR = ${DESTDIR}/$(exec_prefix)/share/hdf5_examples/c # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. diff --git a/examples/testh5cc.sh.in b/examples/testh5cc.sh.in index 0e2b851..16505c2 100755 --- a/examples/testh5cc.sh.in +++ b/examples/testh5cc.sh.in @@ -29,7 +29,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@" |