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 a365e11ab1022979c3eea36660d52c50ed422d5a..2cc48eebe31758b688c123453b0c89be9c6324df 100755 (executable)
--- 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 fab5f5f10e878f6324ca9aedd6770b1825cfc642..503a67353a9d641406b492699104c896f8a70cfc 100755 (executable)
--- 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 0561bf76781d40ca347a36f066759e322c3dbdb5..41cf817d0e349810d432459d9c6d8295d54f2231 100755 (executable)
--- 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" \