Changeset 2ee51e6

Timestamp:

07/25/2005 06:30:44 AM (19 years ago)

Author:

Tushar Teredesai <tushar@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

323d61c

Parents:

ecb6484a

Message:

xorg optional defines, textual corrections for fontconfig and sgml-common

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

Files:

• general.ent (modified) (1 diff)
• general/graphlib/fontconfig.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• pst/sgml/sgml-common.xml (modified) (1 diff)
• x/installing/xorg.xml (modified) (1 diff)

general.ent

@@ -1 @@
-<!ENTITY day          "24">
+<!ENTITY day          "25">
 <!ENTITY month        "07">
 <!ENTITY year         "2005">

general/graphlib/fontconfig.xml

@@ -95 +95 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>Additionally, install the documentation by executing the following
+    <para>The release tarballs also included pre-generated documentation that is not
+        installed by the above command. To install the documentation, execute the following
         as the <systemitem class="username">root</systemitem> user:</para>
 

introduction/welcome/changelog.xml

@@ -25 +25 @@
   <itemizedlist>
     
+        <listitem>
+                <para>July 25th 2005 [tushar]: Added optional defines to xorg to
+                allow installation into standard directories.</para>
+        </listitem>
+
     <listitem>
       <para>July 24th 2005 [dj]: Updated to Linux-PAM-0.80 and corrected

pst/sgml/sgml-common.xml

@@ -69 +69 @@
     <title>Installation of SGML Common</title>
 
-    <para>First apply the patch:</para>
-
-<screen><userinput>patch -Np1 -i ../sgml-common-0.6.3-manpage-1.patch</userinput></screen>
-
-    <para>The autotools files included with
-    <application>SGML Common</application> are old. Use
-    the following commands to regenerate the files.</para>
-
-<screen><userinput>aclocal &amp;&amp;
-automake -acf &amp;&amp;
-autoconf</userinput></screen>
+        <para>Instead of the normal convention of including the autotools files in the package,
+        the maintainers included symlinks to the files in
+        <filename class="directory">/usr/share/automake</filename>. For previous versions of
+        <application>automake</application> this convention is correct, but recent versions of
+        <application>automake</application> install the internal files in version specific directories.
+        This causes the <command>configure</command> to abort.
+        To fix this error, the autotools are regenerated. Since the included
+        <filename>Makefile.am</filename> uses a syntax not supported by current versions of
+        <application>automake</application>, we also need to apply the patch to fix the
+        syntax.</para>
+        
+<screen><userinput>patch -Np1 -i ../sgml-common-0.6.3-manpage-1.patch &amp;&amp;
+autoreconf -f -i</userinput></screen>
 
     <para>Install <application>SGML Common</application> by

x/installing/xorg.xml

@@ -303 +303 @@
 #define BuildXprintClients      NO
 
+/* Uncomment the following define if you would prefer to install X into
+ * /usr or change it to any other location that you prefer.
+ * The GL defines disable compatibility symlinks (the links are not needed
+ * when X is installed in /usr.
+#define ProjectRoot /usr
+ */
+
+/* Uncomment the following define if you would prefer to install the
+ * fonts into /usr/share/fonts, a directory that is fontconfig's default
+ * font search path.
+#define FontDir /usr/share/fonts
+ */
+
 /* End Xorg host.def file */</literal>
 EOF</userinput></screen>