summaryrefslogtreecommitdiff
path: root/doc/faq
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-15 23:42:22 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-01-15 23:42:22 +0000
commit0d53acade0cc2568aac531f2763aafc332a50012 (patch)
tree173952f0a3fdf38a5e1ac0d5c7278c4c88a10be2 /doc/faq
parente72c4a90724ed3bed717e80f596044f56e5ad0b8 (diff)
parent829ea40e61ad297815c16de1ffb022a8e4b86c97 (diff)
downloadxine-lib-0d53acade0cc2568aac531f2763aafc332a50012.tar.gz
xine-lib-0d53acade0cc2568aac531f2763aafc332a50012.tar.bz2
Merge from 1.1, but neither distribute nor include by default xine_mmx.h.
--HG-- rename : doc/faq/faq.sgml => doc/faq/faq.docbook rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
Diffstat (limited to 'doc/faq')
-rw-r--r--doc/faq/faq.docbook4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/faq/faq.docbook b/doc/faq/faq.docbook
index e8b721e5d..7b8acd7a9 100644
--- a/doc/faq/faq.docbook
+++ b/doc/faq/faq.docbook
@@ -333,7 +333,7 @@
In case that you have a fresh CVS checkout, you will need to do the
following first in order to get a tarball release out of it which you
can later use with the <command>rpmbuild -ta</command> command above:
- <screen>&nbsp;&nbsp;&nbsp;<command>./autogen.sh &amp;&amp; make clean && make dist</command></screen>
+ <screen>&nbsp;&nbsp;&nbsp;<command>./autogen.sh &amp;&amp; make clean &amp;&amp; make dist</command></screen>
</para>
<para>
In any case, please keep in mind that you have to build and install
@@ -364,7 +364,7 @@
<screen>
&nbsp;&nbsp;&nbsp;<command>cd ..</command>
&nbsp;&nbsp;&nbsp;<command>ls *.deb</command>
-&nbsp;&nbsp;&nbsp;<command>su - -c 'cd '"`pwd`"' && dpkg -i &lt;DEB_PACKAGES&gt;'</command>
+&nbsp;&nbsp;&nbsp;<command>su - -c 'cd '"`pwd`"' &amp;&amp; dpkg -i &lt;DEB_PACKAGES&gt;'</command>
</screen>
Ubuntu users will probably want to use this instead of that <command>su</command>:
<screen>