commit f7bc338b9eae9ded65f6600370910c9ebf1dc426
author Conley Owens <cco3@android.com> Mon Jun 04 13:52:50 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 04 13:52:50 2012 -0700
tree eceb2f8dcfaa6c0caf8619bd7e228fe0a9295322
parent 829e65a6d47168b46a6512960243a78ed12b34eb
parent 26bd7f2c969ae4dec6494415baa97ebe0a9bbe40

am 26bd7f2c: am 8e39c18f: Merge "Handle multiarch libgl-mesa-dev on Ubuntu 12.04"

* commit '26bd7f2c969ae4dec6494415baa97ebe0a9bbe40':
  Handle multiarch libgl-mesa-dev on Ubuntu 12.04

src/source/initializing.md

diff --git a/src/source/initializing.md b/src/source/initializing.md
index bbe3357..82dc8c0 100644
--- a/src/source/initializing.md
+++ b/src/source/initializing.md
@@ -113,9 +113,11 @@
 
     $ sudo apt-get install git-core gnupg flex bison gperf build-essential \
       zip curl libc6-dev libncurses5-dev:i386 x11proto-core-dev \
-      libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-dev:i386 \
-      g++-multilib mingw32 openjdk-6-jdk tofrodos python-markdown \
-      libxml2-utils xsltproc zlib1g-dev:i386 libxext-dev:i386
+      libx11-dev:i386 libreadline6-dev:i386 libgl1-mesa-glx:i386 \
+      libgl1-mesa-dev g++-multilib mingw32 openjdk-6-jdk tofrodos \
+      python-markdown libxml2-utils xsltproc zlib1g-dev:i386 \
+      libxext-dev:i386
+    $ sudo ln -s /usr/lib/i386-linux-gnu/mesa/libGL.so.1 /usr/lib/i386-linux-gnu/libGL.so
 
 ## Configuring USB Access ##