commit 1226b08124bee5aaa77bb4f8c1416a247b62a19b
author Adam Tkac <atkac@redhat.com> Wed Sep 15 11:39:11 2010 +0000
committer Adam Tkac <atkac@redhat.com> Wed Sep 15 11:39:11 2010 +0000
tree 29a57bc6b7276cb6755413f692a00752fd66b188
parent 42d326097200039fcb5b7510eaa26647a8f7cc49

[Development] Handle .tar.gz Mesa archives in build-xorg script correctly.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4134 3789f03b-4d11-0410-bbf8-ca57d06f2519

unix/build-xorg

diff --git a/unix/build-xorg b/unix/build-xorg
index 764f14a..98ee458 100755
--- a/unix/build-xorg
+++ b/unix/build-xorg
@@ -97,7 +97,12 @@
     for module in ${modules}; do
         tar jxf ~/.tigervnc-xorg-$XORG_VERSION/${module}.tar.bz2
     done
-    tar jxf ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.bz2
+
+    [ -r ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.bz2 ] && \
+        tar jxf ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.bz2
+    [ -r ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.gz ] && \
+        tar zxf ~/.tigervnc-xorg-$XORG_VERSION/Mesa.tar.gz
+
     tar jxf ~/.tigervnc-xorg-$XORG_VERSION/freetype.tar.bz2
     tar jxf ~/.tigervnc-xorg-$XORG_VERSION/xorg-server.tar.bz2
     cp -r $SRCDIR/unix/xserver xserver