diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2015-04-29 07:31:16 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2015-04-29 07:31:16 (GMT) |
| commit | 725e20294e0ea2aedb20f2745564f71e053bb3dc (patch) | |
| tree | 6c18d6d58e5cbb05465b91482e89a272e6f3f4f8 /hl | |
| parent | 28c0d72b7e98f034c8375124f2fbf6b2f878f69b (diff) | |
| download | hdf5-725e20294e0ea2aedb20f2745564f71e053bb3dc.zip hdf5-725e20294e0ea2aedb20f2745564f71e053bb3dc.tar.gz hdf5-725e20294e0ea2aedb20f2745564f71e053bb3dc.tar.bz2 | |
[svn-r26964] HDFFV-9298: make uninstall generated "test: argument expected" lines
The error is that $EXAMPLETOPDIR is used without setting a value first.
Solution is to set them with the proper values.
Tested: jam only to confirm the error no longer exists.
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/c++/examples/Makefile.am | 1 | ||||
| -rw-r--r-- | hl/c++/examples/Makefile.in | 1 | ||||
| -rw-r--r-- | hl/fortran/examples/Makefile.am | 1 | ||||
| -rw-r--r-- | hl/fortran/examples/Makefile.in | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am index c8f0305..7202a96 100644 --- a/hl/c++/examples/Makefile.am +++ b/hl/c++/examples/Makefile.am @@ -36,6 +36,7 @@ CXX_API=yes # Where to install examples # Note: no '/' after DESTDIR. Explanation in commence.am EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++ +EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl # How to build programs using h5c++ $(EXTRA_PROG): $(H5CPP) diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index a36886c..5bad31f 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -616,6 +616,7 @@ CXX_API = yes # Where to install examples # Note: no '/' after DESTDIR. Explanation in commence.am EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++ +EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am index 91cb7c5..6a5032b 100644 --- a/hl/fortran/examples/Makefile.am +++ b/hl/fortran/examples/Makefile.am @@ -54,6 +54,7 @@ endif # Tell automake how to install examples # Note: no '/' after DESTDIR. Explanation in commence.am EXAMPLEDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/fortran +EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl # List dependencies for each example. Normally, automake would take # care of this for us, but if we tell automake about the programs it diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index c8878d5..e229f12 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -623,6 +623,7 @@ FORTRAN_API = yes # Tell automake how to install examples # Note: no '/' after DESTDIR. Explanation in commence.am EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/fortran +EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. |