Merge branch 'wip-2010' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/homepage into wip-2010

Conflicts:
	index.html

1 files changed, 4 insertions, 4 deletions

diff --git a/index.html b/index.html
index 739132f..204addf 100644
--- a/index.html
+++ b/index.html
@@ -383,9 +383,9 @@ make modules
     <p class="notopmargin"> 

     The user-space library for real-time tasks, <span class="src">liblitmus</span>, 

     depends on the LITMUS<sup>RT</sup> kernel kernel and provides its own build system (based on <a href="http://www.scons.org/">scons</a>). 

-    In order to compile <span class="src">liblitmus</span>, you need to adjust the

-    variable <span class="src">LITMUS_KERNEL</span> in the <span class="src">SConstruct</span> file to point to your 

-    copy of the kernel. Users should not update the <span class="src">SConstruct</span> file manually anymore. Instead, a <span class="src">.config</span> file can be created with appropriate variables. The required variables can be listed using <span class="src"> scons -h </span> command. This command lists the variables required for building the <span class="src"> liblitmus2010 </span> library. For reference, we provide a sample <a href="download/2010.1/liblitmus-2010-config"> config </a> file.

+    In order to compile <span class="src">liblitmus</span>, you need to adjust the
+    variable <span class="src">LITMUS_KERNEL</span> in the <span class="src">.config</span> file to point to your 

+    copy of the kernel. The variables required for building <span class="src">liblitmus </span> can be listed using <span class="src"> scons -h </span> command. For reference, we provide a sample <a href="download/2010.1/liblitmus-2010-config"> config </a> file.

    Sample output of <span class="src"> scons -h </span> is as shown below.

     </p> 

    <pre class="shell"> 

@@ -427,7 +427,7 @@ cd $DIR
 wget http://www.cs.unc.edu/~anderson/litmus-rt/download/2010.1/liblitmus-2010.1.tgz

 tar xzf liblitmus-2010.1.tgz

 cd liblitmus 

-# change LITMUS_KERNEL in SConstruct to point to the kernel source

+# change LITMUS_KERNEL in .config to point to the kernel source

 scons

 </pre> 

     <p class="nobottommargin">