[Xfce4-commits] <midori:master> Allow to extract files from mingw packages using w64 toolchain

[Christian Dywan]

Updating branch refs/heads/master
         to 0a6a8853a61fd1a2b0f60767bd7efa53cdc98407 (commit)
       from 6d9ec0ca02a08333bb63af65b901150391d1a3a6 (commit)

commit 0a6a8853a61fd1a2b0f60767bd7efa53cdc98407
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Thu Apr 28 22:30:41 2011 +0200

    Allow to extract files from mingw packages using w64 toolchain
    
    http://mingw-w64.sourceforge.net/

 win32/x86-mingw32-opensuse/install.sh |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/win32/x86-mingw32-opensuse/install.sh b/win32/x86-mingw32-opensuse/install.sh
index 909a523..3d54e09 100644
--- a/win32/x86-mingw32-opensuse/install.sh
+++ b/win32/x86-mingw32-opensuse/install.sh
@@ -56,13 +56,29 @@ do
   pushd $BUILD_PATH
   # extract rpm
   rpm2cpio $DOWNLOAD_PATH/$line | cpio -i -d
-  # convert pkgconfig files
-  if [ -d $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig ]
+
+  if [ -d $BUILD_PATH/usr/i686-pc-ming32/sys-root/mingw ]
   then
-    sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-pc-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/*.pc
+    # convert pkgconfig files
+    if [ -d $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig ]
+    then
+      sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-pc-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig/*.pc
+    fi
+    # install the package
+    cp -rf $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/* $INSTALL_PATH/
   fi
-  # install the package
-  cp -rf $BUILD_PATH/usr/i686-pc-mingw32/sys-root/mingw/* $INSTALL_PATH/
+
+  if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw ]
+  then
+    # convert pkgconfig files
+    if [ -d $BUILD_PATH/usr/i686-w64=mingw32/sys-root/mingw/lib/pkgconfig ]
+    then
+      sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e 's@/usr/i686-w64-mingw32/sys-root/mingw@${prefix}@' $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/*.pc
+    fi
+    # install the package
+    cp -rf $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/* $INSTALL_PATH/
+  fi
+
   # remove the extracted file
   rm -rf $BUILD_PATH/usr
   popd