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

Updated Xorg for FHS compliance. Thanks 'linux fan'.

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8632 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
DJ Lucas 2010-10-14 03:27:03 +00:00
parent 446c94cfc0
commit bbe9eba08a
6 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
general.ent
View File

@ -3,7 +3,7 @@ $LastChangedBy$
$Date$
-->
<!ENTITY day "12"> <!-- Always 2 digits -->
<!ENTITY day "14"> <!-- Always 2 digits -->
<!ENTITY month "10"> <!-- Always 2 digits -->
<!ENTITY year "2010">
<!ENTITY copyrightdate "2001-&year;">

2
general/genutils/xterm.xml
View File

@ -80,7 +80,7 @@
echo -e '\tkbs=\\177,' &gt;&gt;terminfo &amp;&amp;
TERMINFO=/usr/lib/terminfo ./configure $XORG_CONFIG \
--enable-luit --enable-wide-chars \
--with-app-defaults=$XORG_PREFIX/share/X11/app-defaults &amp;&amp;
--with-app-defaults=/etc/X11/app-defaults &amp;&amp;
make</userinput></screen>
<para>This package does not come with a test suite.</para>

19
introduction/welcome/changelog.xml
View File

@ -28,7 +28,7 @@
<!-- Changelog template
<listitem>
<para>Date</para>
<para>MMMM DD{nd,st,th}, YYYY</para>
<itemizedlist>
<listitem>
<para>[name] - Changelog entry.</para>
@ -42,7 +42,18 @@
-->
<listitem>
<para>October 12th</para>
<para>October 14th, 2010</para>
<itemizedlist>
<listitem>
<para>[dj] - Removed FHS section of X Setup page and corrected
in the installation instructions for individual packages. Thanks to
<quote>linux fan</quote> for the suggestions.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>October 12th, 2010</para>
<itemizedlist>
<listitem>
<para>[ken] - Updated to Gimp-2.6.8. Fixes ticket
@ -55,7 +66,7 @@
</listitem>
<listitem>
<para>October 10th</para>
<para>October 10th, 2010</para>
<itemizedlist>
<listitem>
<para>[ken] - Added new package, Babl-0.1.2. Fixes ticket
@ -69,7 +80,7 @@
</listitem>
<listitem>
<para>September 27th</para>
<para>September 27th, 2010</para>
<itemizedlist>
<listitem>
<para>[ken] - Marked a few packages that are known to be OK with LFS-6.7.</para>

3
x/installing/x-setup.xml
View File

@ -51,7 +51,7 @@
<screen role="root"><userinput>ln -vsf <replaceable>&lt;$XORG_PREFIX&gt;</replaceable> /usr/X11R6</userinput></screen>
<para>Packages in Xorg store their configuration files in
<!-- <para>Packages in Xorg store their configuration files in
<filename class="directory">$XORG_PREFIX/lib/X11</filename> by default.
This is strictly against FHS guidelines. Correct the installation
<filename class="directory">/etc/X11</filename> and create symlinks
@ -65,6 +65,7 @@ do
ln -v -s /etc/X11/$(basename $file) $file
done
</userinput></screen>
-->
</sect2>

14
x/installing/x7app.xml
View File

@ -101,7 +101,19 @@ md5sum -c ../app-&xorg7-release;.md5</userinput></screen>
<para>Install the applications by running the following commands for each
package:</para>
<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
<screen><userinput>case $(basename "$PWD") in
twm-[0-9]* )
sed -e '/^rcdir =/s,^\(rcdir = \).*,\1/etc/X11/app-defaults,' \
-i src/Makefile.in &amp;&amp;
./configure $XORG_CONFIG
;;
xinit-[0-9]* )
./configure $XORG_CONFIG --with-xinitdir=/etc/X11/app-defautls
;;
* )
./configure $XORG_CONFIG
;;
esac &amp;&amp;
make</userinput></screen>
<para>These packages do not provide test suites.</para>

4
x/installing/x7lib.xml
View File

@ -113,6 +113,10 @@ libXfont-[0-9]* )
libX11-[0-9]* )
./configure $XORG_CONFIG --without-xcb
;;
libXt-[0-9]* )
./configure $XORG_CONFIG \
--with-appdefaultdir=/etc/X11/app-defaults
;;
* )
./configure $XORG_CONFIG
;;