diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2010-02-15 06:49:30 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2010-02-15 06:49:30 +0000 |
| commit | d6be0fa66f6fca86a741b49c9ac3717a072a96d0 (patch) | |
| tree | 6da856485eccc3c76ad804b836c7af580409d39b /cpp/src/tests | |
| parent | 75b9098e465a9da8764514410c93f79beb1d3be0 (diff) | |
| download | qpid-python-d6be0fa66f6fca86a741b49c9ac3717a072a96d0.tar.gz | |
more futzing with setup.py; pulled specs into python/qpid package
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@910165 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/Makefile.am | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 55d76ec6a5..4d65803ac1 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -370,16 +370,13 @@ check: python_prep PYTHON_SRC_DIR=$(abs_srcdir)/../../../python PYTHON_BLD_DIR=$(abs_builddir)/python -AMQP_SPEC_DIR=$(abs_srcdir)/../../../specs # Generate python client as part of the all-am target so it gets built before tests. all-am: python_prep python_prep: - if test -d $(PYTHON_SRC_DIR) -a -d $(AMQP_SPEC_DIR); \ + if test -d $(PYTHON_SRC_DIR); \ then cd $(PYTHON_SRC_DIR) && python $(PYTHON_SRC_DIR)/setup.py install \ --prefix=$(PYTHON_BLD_DIR) --install-lib=$(PYTHON_BLD_DIR) \ - --install-scripts=$(PYTHON_BLD_DIR)/commands \ - --amqp-spec-dir=$(AMQP_SPEC_DIR); \ - else echo "WARNING: python client not built, missing one of $(PYTHON_SRC_DIR) $(AMQP_SPEC_DIR)"; fi - + --install-scripts=$(PYTHON_BLD_DIR)/commands; \ + else echo "WARNING: python client not built, missing $(PYTHON_SRC_DIR)"; fi |