diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2010-10-04 17:15:30 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2010-10-04 17:15:30 (GMT) |
| commit | 155b00d8ff1b9274fefebced5954bfb0f647b4af (patch) | |
| tree | 27a70db09d11d725429d701e9f9eeccc98c944d3 /examples/Makefile.am | |
| parent | dc4756fbf47d8fe84472269f24cedc16c8093c48 (diff) | |
| download | hdf5-155b00d8ff1b9274fefebced5954bfb0f647b4af.zip hdf5-155b00d8ff1b9274fefebced5954bfb0f647b4af.tar.gz hdf5-155b00d8ff1b9274fefebced5954bfb0f647b4af.tar.bz2 | |
[svn-r19506] Bring changes from revisions 19408, 19421, and 19442 from branches/hdf5_1_8 to trunk. These revisions reorganize the compile scripts using h5cc.in, h5fc.in, and h5c++.in, add checks for installed examples to the scripts that run them after installation, and add DESTDIR for install as needed for RPMs.
Tested on amani, heiwa and jam by h5committest and with CYGWIN.
Diffstat (limited to 'examples/Makefile.am')
| -rw-r--r-- | examples/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 92830df..8a428ae 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -69,8 +69,9 @@ $(EXTLINK_DIRS): CHECK_CLEANFILES+=$(EXTLINK_DIRS) # Example directory -EXAMPLEDIR=${DESTDIR}/$(exec_prefix)/share/hdf5_examples/c -EXAMPLETOPDIR=${DESTDIR}/$(exec_prefix)/share/hdf5_examples +# Note: no '/' after DESTDIR. Explanation in commence.am +EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/c +EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples # List dependencies for each program. Normally, automake would take # care of this for us, but if we tell automake about the programs it |