This is an automated email from the ASF dual-hosted git repository.
jross pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new 5b6f102 PROTON-1801: Strip the version from the /usr/share/proton dir
5b6f102 is described below
commit 5b6f10243db63c05bb0ab2f0f12a0390a98874a4
Author: Justin Ross <jr...@apache.org>
AuthorDate: Mon Dec 2 08:29:35 2019 -0500
PROTON-1801: Strip the version from the /usr/share/proton dir
---
CMakeLists.txt | 2 +-
tests/share/README.txt | 4 ++--
tests/share/examples-README.md | 7 +++----
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1091ba..b7197ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,7 +271,7 @@ foreach (LANG ${BINDING_LANGS})
endif ()
endforeach()
-set (PROTON_SHARE ${SHARE_INSTALL_DIR}/proton-${PN_VERSION})
+set (PROTON_SHARE ${SHARE_INSTALL_DIR}/proton)
# End of variables used during install
# Set result to a native search path - used by examples and binding tests.
diff --git a/tests/share/README.txt b/tests/share/README.txt
index f7864b6..56f49db 100644
--- a/tests/share/README.txt
+++ b/tests/share/README.txt
@@ -1,3 +1,3 @@
This directory is for files that should be installed at the top level
-of the INSTALL_PREFIX/share/proton-VERSION directory to support
-installed testing.
+of the INSTALL_PREFIX/share/proton directory to support installed
+testing.
diff --git a/tests/share/examples-README.md b/tests/share/examples-README.md
index 6f7404c..a9e63e3 100644
--- a/tests/share/examples-README.md
+++ b/tests/share/examples-README.md
@@ -1,4 +1,4 @@
-Verifying the examples
+Verifying the examples
======================
If you have installed support for self-testing a proton installation you can
@@ -7,14 +7,13 @@ automatically run and verify the examples.
To build C, C++ tests and run all tests:
cd TEMP-BUILD-DIR
- cmake INSTALL-PREFIX/share/proton-VERSION/examples
+ cmake INSTALL-PREFIX/share/proton/examples
make
ctest
To run an individual test that does not require CMake, (e.g. ruby):
- cd INSTALL-PREFIX/share/proton-VERSION/examples/ruby
+ cd INSTALL-PREFIX/share/proton/examples/ruby
./testme
Some testme scripts accept additional arguments (e.g. -v for verbose)
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
