r4775 - in trunk/BOOK: . general/graphlib introduction/welcome pst/sgml x/installing

tushar at linuxfromscratch.org tushar at linuxfromscratch.org
Sun Jul 24 23:30:51 PDT 2005


Author: tushar
Date: 2005-07-25 00:30:44 -0600 (Mon, 25 Jul 2005)
New Revision: 4775

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/fontconfig.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/sgml/sgml-common.xml
   trunk/BOOK/x/installing/xorg.xml
Log:
xorg optional defines, textual corrections for fontconfig and sgml-common

Modified: trunk/BOOK/general/graphlib/fontconfig.xml
===================================================================
--- trunk/BOOK/general/graphlib/fontconfig.xml	2005-07-25 05:10:27 UTC (rev 4774)
+++ trunk/BOOK/general/graphlib/fontconfig.xml	2005-07-25 06:30:44 UTC (rev 4775)
@@ -94,7 +94,8 @@
 
 <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>
 
 <screen role="root"><userinput>make -C doc install &&

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-07-25 05:10:27 UTC (rev 4774)
+++ trunk/BOOK/general.ent	2005-07-25 06:30:44 UTC (rev 4775)
@@ -1,4 +1,4 @@
-<!ENTITY day          "24">
+<!ENTITY day          "25">
 <!ENTITY month        "07">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-07-25 05:10:27 UTC (rev 4774)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-07-25 06:30:44 UTC (rev 4775)
@@ -24,6 +24,11 @@
 
   <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
       sed for /etc/login.defs in Shadow instructions.</para>

Modified: trunk/BOOK/pst/sgml/sgml-common.xml
===================================================================
--- trunk/BOOK/pst/sgml/sgml-common.xml	2005-07-25 05:10:27 UTC (rev 4774)
+++ trunk/BOOK/pst/sgml/sgml-common.xml	2005-07-25 06:30:44 UTC (rev 4775)
@@ -68,18 +68,20 @@
   <sect2 role="installation">
     <title>Installation of SGML Common</title>
 
-    <para>First apply the patch:</para>
+	<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 &&
+autoreconf -f -i</userinput></screen>
 
-<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 &&
-automake -acf &&
-autoconf</userinput></screen>
-
     <para>Install <application>SGML Common</application> by
     running the following commands:</para>
 

Modified: trunk/BOOK/x/installing/xorg.xml
===================================================================
--- trunk/BOOK/x/installing/xorg.xml	2005-07-25 05:10:27 UTC (rev 4774)
+++ trunk/BOOK/x/installing/xorg.xml	2005-07-25 06:30:44 UTC (rev 4775)
@@ -302,6 +302,19 @@
 #define XprtServer              NO
 #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>
 




More information about the blfs-book mailing list