Move the installation to a better place and cond-require it on install-deps.sh execut...

diff --git a/build-ceph-deb-native.sh b/build-ceph-deb-native.sh
index cbcf9b8289ba9577679451a3c20079848692f4b8..59ba97b5a8dbda168d6d8736d459f60e3aa08abd 100755 (executable)
--- a/build-ceph-deb-native.sh
+++ b/build-ceph-deb-native.sh
@@ -22,6 +22,7 @@ git clean -fdx
 DIST=`lsb_release -sc`
 
 echo --START-IGNORE-WARNINGS
+[ ! -x install-deps.sh ] || ./install-deps.sh
 [ ! -x autogen.sh ] || ./autogen.sh || exit 1
 autoconf || true
 echo --STOP-IGNORE-WARNINGS
@@ -35,9 +36,6 @@ fi
 
 # Actually build the project
 
-# Install build-time dependencies
-./install-deps.sh
-
 # clear out any $@ potentially passed in
 set --
 

diff --git a/build-ceph-deb.sh b/build-ceph-deb.sh
index 595cf5d924f7f9127b461f8dbad759ccfa23f0c4..146b0b3bcea535310014805638d505b17788d9b1 100755 (executable)
--- a/build-ceph-deb.sh
+++ b/build-ceph-deb.sh
@@ -23,6 +23,7 @@ git clean -fdx
 DISTS=`cat ../../dists`
 
 echo --START-IGNORE-WARNINGS
+[ ! -x install-deps.sh ] || ./install-deps.sh
 [ ! -x autogen.sh ] || ./autogen.sh || exit 1
 autoconf || true
 echo --STOP-IGNORE-WARNINGS
@@ -36,9 +37,6 @@ fi
 
 # Actually build the project
 
-# Install build-time dependencies
-./install-deps.sh
-
 # clear out any $@ potentially passed in
 set --
 

diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh
index 9be57d3730c65fe04bfe0f2b5c8ea4323725e425..31ccf8a16c30688c8d63755725a7a282348a5afb 100755 (executable)
--- a/build-ceph-gcov.sh
+++ b/build-ceph-gcov.sh
@@ -21,6 +21,7 @@ git clean -fdx && git reset --hard
 git clean -fdx
 
 echo --START-IGNORE-WARNINGS
+[ ! -x install-deps.sh ] || ./install-deps.sh
 [ ! -x autogen.sh ] || ./autogen.sh || exit 1
 autoconf || true
 echo --STOP-IGNORE-WARNINGS
@@ -34,9 +35,6 @@ fi
 
 # Actually build the project
 
-# Install build-time dependencies
-./install-deps.sh
-
 # clear out any $@ potentially passed in
 set --
 

diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh
index c21d51397629589a014da5904776b966b2ad4dea..049720e3f3bd8f56af50251e5862a23b27f41314 100755 (executable)
--- a/build-ceph-notcmalloc.sh
+++ b/build-ceph-notcmalloc.sh
@@ -22,6 +22,7 @@ git clean -fdx
 
 
 echo --START-IGNORE-WARNINGS
+[ ! -x install-deps.sh ] || ./install-deps.sh
 [ ! -x autogen.sh ] || ./autogen.sh || exit 1
 autoconf || true
 echo --STOP-IGNORE-WARNINGS
@@ -35,9 +36,6 @@ fi
 
 # Actually build the project
 
-# Install build-time dependencies
-./install-deps.sh
-
 # clear out any $@ potentially passed in
 set --
 

diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh
index d1582cd6239dab658efc55bef6b2cb9f68ab829d..36991a351eaca3331a3c099b16937e6fd7d9131f 100755 (executable)
--- a/build-ceph-rpm.sh
+++ b/build-ceph-rpm.sh
@@ -47,6 +47,7 @@ then
 fi
 
 echo --START-IGNORE-WARNINGS
+[ ! -x install-deps.sh ] || ./install-deps.sh
 [ ! -x autogen.sh ] || ./autogen.sh || exit 1
 autoconf || true
 echo --STOP-IGNORE-WARNINGS
@@ -61,9 +62,6 @@ fi
 
 # Actually build the project
 
-# Install build-time dependencies
-./install-deps.sh
-
 # clear out any $@ potentially passed in
 set --
 

diff --git a/build-ceph.sh b/build-ceph.sh
index 0e846d87cdc2beaefa2bcc8d564ea4b6ca76f809..e6a7f44c6965d865ec2e4795d93fdd5149e660bd 100755 (executable)
--- a/build-ceph.sh
+++ b/build-ceph.sh
@@ -20,6 +20,7 @@ git clean -fdx && git reset --hard
 git clean -fdx
 
 echo --START-IGNORE-WARNINGS
+[ ! -x install-deps.sh ] || ./install-deps.sh
 [ ! -x autogen.sh ] || ./autogen.sh || exit 1
 autoconf || true
 echo --STOP-IGNORE-WARNINGS
@@ -33,9 +34,6 @@ fi
 
 # Actually build the project
 
-# Install build-time dependencies
-./install-deps.sh
-
 # clear out any $@ potentially passed in
 set --