From: Antoine Cellerier <dionoea@videolan.org>
Date: Sat, 8 May 2010 16:36:36 +0000 (+0200)
Subject: Add optional first arg to specify contrib directory.
X-Git-Tag: 1.2.0-pre1~6731
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=669ff5690782c5137f309dbf16b1a3349edbcb39;p=vlc

Add optional first arg to specify contrib directory.

Most of the scripts' content could be factorized.
---

diff --git a/extras/package/win32/configure-cygwin.sh b/extras/package/win32/configure-cygwin.sh
index a365e11ab1..2cc48eebe3 100755
--- a/extras/package/win32/configure-cygwin.sh
+++ b/extras/package/win32/configure-cygwin.sh
@@ -2,10 +2,18 @@
 
 root=$(echo $0|sed 's#extras/package/win32/configure-cygwin.sh##')./
 
-PATH="/usr/win32/bin:$PATH" \
-PKG_CONFIG_LIBDIR=/usr/win32/lib/pkgconfig \
-CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
-LDFLAGS="-L/usr/win32/lib" \
+if [ -n $1 ]
+then
+       CONTRIBS="$1"
+else
+       CONTRIBS="/usr/win32"
+fi
+export CONTRIBS
+
+PATH="$CONTRIBS/bin:$PATH" \
+PKG_CONFIG_LIBDIR=$CONTRIBS/lib/pkgconfig \
+CPPFLAGS="-I$CONTRIBS/include -I$CONTRIBS/include/ebml" \
+LDFLAGS="-L$CONTRIBS/lib" \
 CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
 CONFIG="${root}configure --host=i686-pc-mingw32
        --disable-nls --disable-taglib --disable-mkv --disable-dirac --enable-debug" \
diff --git a/extras/package/win32/configure-mingw-release.sh b/extras/package/win32/configure-mingw-release.sh
index fab5f5f10e..503a67353a 100755
--- a/extras/package/win32/configure-mingw-release.sh
+++ b/extras/package/win32/configure-mingw-release.sh
@@ -2,10 +2,18 @@
 
 root=$(echo $0|sed 's#extras/package/win32/configure-mingw-release.sh##')./
 
-PATH="/usr/win32/bin:$PATH" \
-PKG_CONFIG_LIBDIR=/usr/win32/lib/pkgconfig \
-CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
-LDFLAGS="-L/usr/win32/lib" \
+if [ -n $1 ]
+then
+	CONTRIBS="$1"
+else
+	CONTRIBS="/usr/win32"
+fi
+export CONTRIBS
+
+PATH="$CONTRIBS/bin:$PATH" \
+PKG_CONFIG_LIBDIR=$CONTRIBS/lib/pkgconfig \
+CPPFLAGS="-I$CONTRIBS/include -I$CONTRIBS/include/ebml" \
+LDFLAGS="-L$CONTRIBS/lib" \
 CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
 CONFIG="${root}configure --host=i586-mingw32msvc --build=i386-linux
  --enable-dirac --enable-mkv --enable-taglib --enable-release --enable-nls --enable-projectm" \
diff --git a/extras/package/win32/configure-msys.sh b/extras/package/win32/configure-msys.sh
index 0561bf7678..41cf817d0e 100755
--- a/extras/package/win32/configure-msys.sh
+++ b/extras/package/win32/configure-msys.sh
@@ -2,10 +2,18 @@
 
 root=$(echo $0|sed 's#extras/package/win32/configure-msys.sh##')./
 
-PATH="/usr/win32/bin:$PATH" \
-PKG_CONFIG_LIBDIR=/usr/win32/lib/pkgconfig \
-CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
-LDFLAGS="-L/usr/win32/lib" \
+if [ -n $1 ]
+then
+       CONTRIBS="$1"
+else
+       CONTRIBS="/usr/win32"
+fi
+export CONTRIBS
+
+PATH="$CONTRIBS/bin:$PATH" \
+PKG_CONFIG_LIBDIR=$CONTRIBS/lib/pkgconfig \
+CPPFLAGS="-I$CONTRIBS/include -I$CONTRIBS/include/ebml" \
+LDFLAGS="-L$CONTRIBS/lib" \
 CC=gcc CXX=g++ \
 CONFIG="${root}configure --host=i586-mingw32msvc --build=i386-linux
     --disable-mkv --disable-taglib --disable-nls --disable-dirac --enable-debug" \