[vlc-devel] commit: Don't look for svn or git in strange paths, use $PATH ( Rafaël Carré )

git version control git at videolan.org
Wed Mar 12 21:19:11 CET 2008


vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Mar 12 17:28:15 2008 +0100| [7c79c5512c7f3a7da087f0dc942f9377e7caa7c6]

Don't look for svn or git in strange paths, use $PATH

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7c79c5512c7f3a7da087f0dc942f9377e7caa7c6
---

 extras/contrib/bootstrap |   24 ++++--------------------
 1 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index fbba865..70169a5 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -278,30 +278,14 @@ else
     exit 1
 fi
 
-if test -f /sw/bin/svn; then
-    echo "SVN = /sw/bin/svn" >> config.mak
-elif test -f /usr/local/bin/svn; then
-    echo "SVN = /usr/local/bin/svn" >> config.mak
-elif test -f /usr/bin/svn; then
-    echo "SVN = /usr/bin/svn" >> config.mak
-elif test -f /opt/local/bin/svn; then
-    echo "SVN = /opt/local/bin/svn" >> config.mak
-elif svn help >/dev/null 2>&1; then
+if svn help >/dev/null 2>&1; then
     echo "SVN = `which svn`" >> config.mak
 else
-    echo "You do not have a subversion client installed." >&2
+    echo "You do not have a subversion client in your PATH." >&2
 fi
 
-if test -f /sw/bin/git; then
-    echo "GIT = /sw/bin/git" >> config.mak
-elif test -f /usr/local/bin/git; then
-    echo "GIT = /usr/local/bin/git" >> config.mak
-elif test -f /usr/bin/git; then
-    echo "GIT = /usr/bin/git" >> config.mak
-elif test -f /opt/local/bin/git; then
-    echo "GIT = /opt/local/bin/git" >> config.mak
-elif git help >/dev/null 2>&1; then
+if git help >/dev/null 2>&1; then
     echo "GIT = `which git`" >> config.mak
 else
-    echo "You do not have a Git client installed." >&2
+    echo "You do not have a Git client in your PATH." >&2
 fi




More information about the vlc-devel mailing list