Reorganize source tree to use single autotools instance

Change-Id: I7b51f88292e057c6443b12224486f2d0c9f8ae23
Signed-off-by: Damjan Marion <damarion@cisco.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/build-root/scripts/find-plugins-contents b/build-root/scripts/find-plugins-contents
index a5a52acf..4108f790 100755
--- a/build-root/scripts/find-plugins-contents
+++ b/build-root/scripts/find-plugins-contents
@@ -2,14 +2,14 @@
 
 rm -f $2
 
-for i in ${1}/plugins/lib64/vpp_plugins/*.so; do
+for i in ${1}/{plugins,vpp}/lib64/vpp_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_plugins >> ${2}
 done
 
-for i in ${1}/plugins/lib64/vpp_api_test_plugins/*.so; do
+for i in ${1}/{plugins,vpp}/lib64/vpp_api_test_plugins/*.so; do
 	echo ../${i} /usr/lib/vpp_api_test_plugins >> ${2}
 done
 
-for i in $(find ${1}/plugins -name *.api.json -type f -print); do
+for i in $(find ${1}/plugins ${1}/vpp/share/vpp/api/plugins/ -name *.api.json -type f -print); do
     echo ../${i} /usr/share/vpp/api/ >> ${2}
 done
diff --git a/build-root/scripts/find-python-api-contents b/build-root/scripts/find-python-api-contents
index 9b390e75..24e8532c 100755
--- a/build-root/scripts/find-python-api-contents
+++ b/build-root/scripts/find-python-api-contents
@@ -2,7 +2,7 @@
 
 rm -f $2
 
-for i in $(find ${1}/vpp-api/lib/python2.7/site-packages/ -type f -print); do
+for i in $(find ${1}/{vpp,vpp-api}/lib/python2.7/site-packages/ -type f -print); do
     echo ../${i} /usr/lib/python2.7/site-packages/vpp_papi >> ${2}
 done