Changeset 87b2a53 for x

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, 12.0, 12.1, 7.10, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

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:

• x/installing/xorg7.xml (modified) (6 diffs)

x/installing/xorg7.xml

@@ -124 +124 @@
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role="root">cat &gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
-XORG_PREFIX="<replaceable>&lt;PREFIX&gt;</replaceable>"
-XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var --disable-static"
+<screen role="root"><userinput>cat &gt; /etc/profile.d/xorg.sh &lt;&lt; EOF
+XORG_PREFIX="$XORG_PREFIX"
+XORG_CONFIG="--prefix=\$XORG_PREFIX --sysconfdir=/etc --localstatedir=/var --disable-static"
 export XORG_PREFIX XORG_CONFIG
 EOF
@@ -146 +146 @@
     as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role="root">cat &gt;&gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt;&gt; /etc/profile.d/xorg.sh &lt;&lt; "EOF"
 
 pathappend $XORG_PREFIX/bin             PATH
@@ -167 +167 @@
     command:</para>
 
-<screen><userinput role="root">echo "$XORG_PREFIX/lib" >> /etc/ld.so.conf</userinput></screen>
+<screen role="root"><userinput>echo "$XORG_PREFIX/lib" >> /etc/ld.so.conf</userinput></screen>
 
     <para>You should also modify
@@ -176 +176 @@
     user:</para>
 
-<screen><userinput role="root">sed "s@/usr/X11R6@<replaceable>$XORG_PREFIX</replaceable>@g" -i /etc/man_db.conf</userinput></screen>
+<screen role="root"><userinput>sed "s@<replaceable>/usr/X11R6</replaceable>@$XORG_PREFIX@g" -i /etc/man_db.conf</userinput></screen>
 
     <para>Some applications look for shared files in <filename
@@ -183 +183 @@
     user:</para>
 
-<screen><userinput role="root">ln -sf $XORG_PREFIX/share/X11 /usr/share/X11</userinput></screen>
+<screen role="root"><userinput>ln -sf $XORG_PREFIX/share/X11 /usr/share/X11</userinput></screen>
 
     <para>If building KDE, some cmake files look for Xorg in places other than
     $XORG_PREFIX.  Allow cmake to find Xorg with:</para>
 
-<screen><userinput role="root">ln -sf $XORG_PREFIX /usr/X11R6</userinput></screen>
+<screen role="root"><userinput>ln -sf $XORG_PREFIX /usr/X11R6</userinput></screen>
 
     <para>Finally, if building on x86_64, you will need to create the
@@ -196 +196 @@
     commands:</para>
 
-<screen><userinput role="root">install -v -m755 -d $XORG_PREFIX &amp;&amp;
+<screen role="root"><userinput>install -v -m755 -d $XORG_PREFIX &amp;&amp;
 install -v -m755 -d $XORG_PREFIX/lib &amp;&amp;
 ln -sf lib $XORG_PREFIX/lib64</userinput></screen>