linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 06:52:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced some /usr/X11R6 hacks with references to the compatibility symlink

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7045 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Randy McMurchy 2007-08-12 01:04:53 +00:00
parent 68c8cba0c9
commit 71cd2a5aca
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
general/prog/jdk.xml
View File

@ -269,13 +269,16 @@ done</userinput></screen>
do patch -Np1 -i ${PATCH}
done</userinput></screen>
<para>If your <application>X Window System</application> is installed into
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../xincludes/X11R6_symlink.xml"/>
<!-- <para>If your <application>X Window System</application> is installed into
any prefix other than <filename class="directory">/usr/X11R6</filename>,
execute the following command, replacing
<replaceable>&lt;PREFIX&gt;</replaceable> with the installation prefix of
the <application>X Window System</application>:</para>
<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' {} \;</userinput></screen>
<screen><userinput>find . -type f -exec sed -i 's@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g' {} \;</userinput></screen> -->
<para>Set/unset some variables which affect the build:</para>

7
multimedia/libdriv/sdl.xml
View File

@ -78,13 +78,16 @@
<sect2 role="installation">
<title>Installation of SDL</title>
<para>If your <application>X Window System</application> is installed into
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../xincludes/X11R6_symlink.xml"/>
<!-- <para>If your <application>X Window System</application> is installed into
any prefix other than <filename class="directory">/usr/X11R6</filename>,
execute the following command, replacing
<replaceable>&lt;PREFIX&gt;</replaceable> with the installation prefix of
the <application>X Window System</application>:</para>
<screen><userinput>sed -i 's:/usr/X11R6:<replaceable>&lt;PREFIX&gt;</replaceable>:' configure</userinput></screen>
<screen><userinput>sed -i 's:/usr/X11R6:<replaceable>&lt;PREFIX&gt;</replaceable>:' configure</userinput></screen> -->
<para>Install <application>SDL</application> by running the
following commands:</para>

4
x/lib/lesstif.xml
View File

@ -107,7 +107,7 @@ ldconfig</userinput></screen>
the command below if your X Window System is installed anywhere other than
<filename class='directory'>/usr/X11R6</filename>.</para>
<screen role="root"><userinput>ln -v -s <replaceable>/usr/X11R6</replaceable>/lib/X11/mwm /etc/X11</userinput></screen>
<screen role="root"><userinput>ln -v -s <replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11/mwm /etc/X11</userinput></screen>
</sect2>
@ -134,7 +134,7 @@ ldconfig</userinput></screen>
directory.</para>
<para><command>ln -v -s
<replaceable>/usr/X11R6</replaceable>/lib/X11/mwm /etc/X11</command>:
<replaceable>&lt;/usr/X11R6&gt;</replaceable>/lib/X11/mwm /etc/X11</command>:
Configuration directories located in the <application>X</application>
installation prefix heirarchy typically have a symlink in the
<filename class='directory'>/etc/X11</filename> directory pointing back to

9
x/lib/qt.xml
View File

@ -99,8 +99,11 @@
<sect2 role="installation">
<title>Installation of Qt</title>
<para>The <application>Qt</application> source hard codes the location
of the <application>X Window System</application> installtion to
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../xincludes/X11R6_symlink.xml"/>
<!--<para>The <application>Qt</application> source hard codes the location
of the <application>X Window System</application> installation to
<filename class="directory">/usr/X11R6</filename>. If you've installed
the <application>X Window System</application> in any prefix other than
<filename class="directory">/usr/X11R6</filename>, then you should correct
@ -112,7 +115,7 @@
<screen><userinput>for file in $(grep -lr "X11R6" *)
do
sed -i "s@/usr/X11R6@<replaceable>&lt;PREFIX&gt;</replaceable>@g" $file
done</userinput></screen>
done</userinput></screen> -->
<para>There are several ways to install a complicated package such as
<application>Qt</application>. The files are not completely position