Changeset 87b2a53


Ignore:
Timestamp:
11/14/2015 09:36:59 PM (8 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
ff7ea587
Parents:
8abda171
Message:

Misplaced role="root" in Xorg introduction, and other changes:

  • $XORG_PREFIX is not <replaceable>, /usr/X11R6 is.
  • Use the already set $XORG_PREFIX in /etc/profile.d/xorg.sh.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@16653 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:
1 edited

Legend:

Unmodified
Added
Removed

  • x/installing/xorg7.xml

    r8abda171 r87b2a53  
    124124    <systemitem class="username">root</systemitem> user:</para>
    125125
    126 <screen><userinput role="root">cat &gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
    127 XORG_PREFIX="<replaceable>&lt;PREFIX&gt;</replaceable>"
    128 XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var --disable-static"
     126<screen role="root"><userinput>cat &gt; /etc/profile.d/xorg.sh &lt;&lt; EOF
     127XORG_PREFIX="$XORG_PREFIX"
     128XORG_CONFIG="--prefix=\$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var --disable-static"
    129129export XORG_PREFIX XORG_CONFIG
    130130EOF
    … …  
    146146    as the <systemitem class="username">root</systemitem> user:</para>
    147147
    148 <screen><userinput role="root">cat &gt;&gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
     148<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
    149149
    150150pathappend $XORG_PREFIX/bin             PATH
    … …  
    167167    command:</para>
    168168
    169 <screen><userinput role="root">echo "$XORG_PREFIX/lib" >> /etc/ld.so.conf</userinput></screen>
     169<screen role="root"><userinput>echo "$XORG_PREFIX/lib" >> /etc/ld.so.conf</userinput></screen>
    170170
    171171    <para>You should also modify
    … …  
    176176    user:</para>
    177177
    178 <screen><userinput role="root">sed "s@/usr/X11R6@<replaceable>$XORG_PREFIX</replaceable>@g" -i /etc/man_db.conf</userinput></screen>
     178<screen role="root"><userinput>sed "s@<replaceable>/usr/X11R6</replaceable>@$XORG_PREFIX@g" -i /etc/man_db.conf</userinput></screen>
    179179
    180180    <para>Some applications look for shared files in <filename
    … …  
    183183    user:</para>
    184184
    185 <screen><userinput role="root">ln -sf $XORG_PREFIX/share/X11 /usr/share/X11</userinput></screen>
     185<screen role="root"><userinput>ln -sf $XORG_PREFIX/share/X11 /usr/share/X11</userinput></screen>
    186186
    187187    <para>If building KDE, some cmake files look for Xorg in places other than
    188188    $XORG_PREFIX.  Allow cmake to find Xorg with:</para>
    189189
    190 <screen><userinput role="root">ln -sf $XORG_PREFIX /usr/X11R6</userinput></screen>
     190<screen role="root"><userinput>ln -sf $XORG_PREFIX /usr/X11R6</userinput></screen>
    191191
    192192    <para>Finally, if building on x86_64, you will need to create the
    … …  
    196196    commands:</para>
    197197
    198 <screen><userinput role="root">install -v -m755 -d $XORG_PREFIX &amp;&amp;
     198<screen role="root"><userinput>install -v -m755 -d $XORG_PREFIX &amp;&amp;
    199199install -v -m755 -d $XORG_PREFIX/lib &amp;&amp;
    200200ln -sf lib $XORG_PREFIX/lib64</userinput></screen>
Note: See TracChangeset for help on using the changeset viewer.