| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 1 | From 884b6e3724b75cd92766d5386455983e3557a286 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
| 3 | Date: Fri, 2 May 2014 13:45:05 -0400 |
| 4 | Subject: [PATCH] tests: allow separated src and build dirs |
| 5 | |
| 6 | Fixup Makefile.am to search for static files back in srcdir. |
| 7 | |
| 8 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
| 9 | --- |
| 10 | tests/Makefile.am | 14 +++++++------- |
| 11 | 1 file changed, 7 insertions(+), 7 deletions(-) |
| 12 | |
| 13 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 14 | index 0da514b..b8d7c19 100644 |
| 15 | --- a/tests/Makefile.am |
| 16 | +++ b/tests/Makefile.am |
| 17 | @@ -1006,22 +1006,22 @@ install-ptest: |
| 18 | @(if [ -d ../tools/.libs ] ; then cd ../tools/.libs; fi; \ |
| 19 | install * $(DEST_DIR)/tools) |
| 20 | install -d $(DEST_DIR)/src/network |
| 21 | - cp ../src/network/*.xml $(DEST_DIR)/src/network |
| 22 | + cp $(top_srcdir)/src/network/*.xml $(DEST_DIR)/src/network |
| 23 | install -d $(DEST_DIR)/src/cpu |
| 24 | - cp ../src/cpu/*.xml $(DEST_DIR)/src/cpu |
| 25 | + cp $(top_srcdir)/src/cpu/*.xml $(DEST_DIR)/src/cpu |
| 26 | install ../src/libvirt_iohelper $(DEST_DIR)/src |
| 27 | install -D ../daemon/libvirtd $(DEST_DIR)/daemon/libvirtd |
| 28 | - install -D ../daemon/libvirtd.conf $(DEST_DIR)/daemon/libvirtd.conf |
| 29 | + install -D $(top_srcdir)/daemon/libvirtd.conf $(DEST_DIR)/daemon/libvirtd.conf |
| 30 | @(if [ -d ../daemon/.libs ] ; then cd ../daemon/.libs; fi; \ |
| 31 | install * $(DEST_DIR)/daemon) |
| 32 | install -d $(DEST_DIR)/src/.libs |
| 33 | @(if [ -d ../src/.libs ] ; then cd ../src/.libs; fi; \ |
| 34 | install * $(DEST_DIR)/src/.libs) |
| 35 | install -d $(DEST_DIR)/docs/schemas |
| 36 | - cp ../docs/schemas/*.rng $(DEST_DIR)/docs/schemas |
| 37 | - cp -r ../build-aux $(DEST_DIR) |
| 38 | + cp $(top_srcdir)/docs/schemas/*.rng $(DEST_DIR)/docs/schemas |
| 39 | + cp -r $(top_srcdir)/build-aux $(DEST_DIR) |
| 40 | install -d $(DEST_DIR)/examples/xml |
| 41 | - cp -r ../examples/xml/test $(DEST_DIR)/examples/xml |
| 42 | + cp -r $(top_srcdir)/examples/xml/test $(DEST_DIR)/examples/xml |
| 43 | install -d $(DEST_DIR)/tests/.libs |
| 44 | find . -type d -name "*xml2xml*" -exec cp -r {} $(DEST_DIR)/tests \; |
| 45 | find . -type d -name "*data" -exec cp -r {} $(DEST_DIR)/tests \; |
| 46 | @@ -1029,7 +1029,7 @@ install-ptest: |
| 47 | if [ -f .libs/$$file ]; then \ |
| 48 | install .libs/$$file $(DEST_DIR)/tests; \ |
| 49 | else \ |
| 50 | - install $$file $(DEST_DIR)/tests; \ |
| 51 | + install $(srcdir)/$$file $(DEST_DIR)/tests; \ |
| 52 | fi; \ |
| 53 | done;) |
| 54 | @(if [ -d .libs ]; then install .libs/*.so $(DEST_DIR)/tests/.libs; fi;) |
| 55 | -- |
| 56 | 1.8.3.2 |
| 57 | |