summaryrefslogtreecommitdiffstats
path: root/unix/build-xorg
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2010-09-15 11:39:11 +0000
committerAdam Tkac <atkac@redhat.com>2010-09-15 11:39:11 +0000
commit1226b08124bee5aaa77bb4f8c1416a247b62a19b (patch)
tree29a57bc6b7276cb6755413f692a00752fd66b188 /unix/build-xorg
parent42d326097200039fcb5b7510eaa26647a8f7cc49 (diff)
downloadtigervnc-1226b08124bee5aaa77bb4f8c1416a247b62a19b.tar.gz
tigervnc-1226b08124bee5aaa77bb4f8c1416a247b62a19b.zip
[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
Diffstat (limited to 'unix/build-xorg')
-rwxr-xr-xunix/build-xorg7
1 files changed, 6 insertions, 1 deletions
diff --git a/unix/build-xorg b/unix/build-xorg
index 764f14ae..98ee4587 100755
--- a/unix/build-xorg
+++ b/unix/build-xorg
@@ -97,7 +97,12 @@ update_modules()
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