Author: randy Date: 2006-06-26 09:45:37 -0600 (Mon, 26 Jun 2006) New Revision: 6216
Modified: trunk/BOOK/basicnet/netlibs/libsoup.xml trunk/BOOK/general.ent trunk/BOOK/general/genlib/glib2.xml trunk/BOOK/general/genlib/libglade.xml trunk/BOOK/general/genlib/libgsf.xml trunk/BOOK/general/genlib/libidn.xml trunk/BOOK/general/genlib/libxml.xml trunk/BOOK/general/genutils/gtk-doc.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/x/lib/atk.xml trunk/BOOK/x/lib/cairo.xml trunk/BOOK/x/lib/libwnck.xml trunk/BOOK/x/lib/pango.xml trunk/BOOK/xsoft/graphweb/galeon.xml trunk/BOOK/xsoft/office/evolution.xml trunk/BOOK/xsoft/office/gimp.xml trunk/BOOK/xsoft/office/gnucash.xml trunk/BOOK/xsoft/office/gnumeric.xml trunk/BOOK/xsoft/other/balsa.xml Log: Replaced many instances of repetitive similar text with xinclude files in various package instructions Modified: trunk/BOOK/basicnet/netlibs/libsoup.xml =================================================================== --- trunk/BOOK/basicnet/netlibs/libsoup.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/basicnet/netlibs/libsoup.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -93,6 +93,14 @@ </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> Modified: trunk/BOOK/general/genlib/glib2.xml =================================================================== --- trunk/BOOK/general/genlib/glib2.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/general/genlib/glib2.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -88,10 +88,10 @@ <sect2 role="commands"> <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> - <para><option>--enable-gtk-doc</option>: This switch will rebuild - the API documentation during the <command>make</command> command.</para> - </sect2> <sect2 role="content"> Modified: trunk/BOOK/general/genlib/libglade.xml =================================================================== --- trunk/BOOK/general/genlib/libglade.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/general/genlib/libglade.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -90,8 +90,8 @@ <sect2 role="commands"> <title>Command Explanations</title> - <para><option>--enable-gtk-doc</option>: This switch can be added to - rebuild the HTML documentation.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> </sect2> Modified: trunk/BOOK/general/genlib/libgsf.xml =================================================================== --- trunk/BOOK/general/genlib/libgsf.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/general/genlib/libgsf.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -109,6 +109,9 @@ <application>GConf</application> schema files are installed in the correct location.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> + </sect2> <sect2 role="content"> Modified: trunk/BOOK/general/genlib/libidn.xml =================================================================== --- trunk/BOOK/general/genlib/libidn.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/general/genlib/libidn.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -133,6 +133,14 @@ </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> Modified: trunk/BOOK/general/genlib/libxml.xml =================================================================== --- trunk/BOOK/general/genlib/libxml.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/general/genlib/libxml.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -82,6 +82,14 @@ </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> Modified: trunk/BOOK/general/genutils/gtk-doc.xml =================================================================== --- trunk/BOOK/general/genutils/gtk-doc.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/general/genutils/gtk-doc.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -99,11 +99,8 @@ <sect2 role="commands"> <title>Command Explanations</title> - <para><parameter>--localstatedir=/var/lib</parameter>: This parameter is - used so that ScrollKeeper files are installed in the system ScrollKeeper - database directory - (<filename class='directory'>/var/lib/scrollkeeper</filename>) instead of - <filename class='directory'>/usr/var/scrollkeeper</filename>.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/scrollkeeper-dir.xml"/> </sect2> Modified: trunk/BOOK/general.ent =================================================================== --- trunk/BOOK/general.ent 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/general.ent 2006-06-26 15:45:37 UTC (rev 6216) @@ -1,4 +1,4 @@ -<!ENTITY day "25"> <!-- Always 2 digits --> +<!ENTITY day "26"> <!-- Always 2 digits --> <!ENTITY month "06"> <!-- Always 2 digits --> <!ENTITY year "2006"> <!ENTITY version "svn-&year;&month;&day;"> Modified: trunk/BOOK/introduction/welcome/changelog.xml =================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/introduction/welcome/changelog.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -42,6 +42,16 @@ --> <listitem> + <para>June 26th, 2006</para> + <itemizedlist> + <listitem> + <para>[randy] - Replaced many instances of repetitive similar + text with xinclude files in various package instructions.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>June 25th, 2006</para> <itemizedlist> <listitem> Modified: trunk/BOOK/x/lib/atk.xml =================================================================== --- trunk/BOOK/x/lib/atk.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/x/lib/atk.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -89,8 +89,8 @@ <sect2 role="commands"> <title>Command Explanations</title> - <para><option>--enable-gtk-doc</option>: This option will rebuild - the API documentation during the <command>make</command> command.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> </sect2> Modified: trunk/BOOK/x/lib/cairo.xml =================================================================== --- trunk/BOOK/x/lib/cairo.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/x/lib/cairo.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -120,6 +120,9 @@ <option>--enable-glitz</option> to the <command>configure</command> script.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> + </sect2> <sect2 role="content"> Modified: trunk/BOOK/x/lib/libwnck.xml =================================================================== --- trunk/BOOK/x/lib/libwnck.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/x/lib/libwnck.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -87,6 +87,14 @@ </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> Modified: trunk/BOOK/x/lib/pango.xml =================================================================== --- trunk/BOOK/x/lib/pango.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/x/lib/pango.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -125,8 +125,8 @@ configuration files into <filename class="directory">/etc</filename> instead of <filename class="directory">/usr/etc</filename>.</para> - <para><option>--enable-gtk-doc</option>: This switch will rebuild - the API documentation during the <command>make</command> command.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> </sect2> Modified: trunk/BOOK/xsoft/graphweb/galeon.xml =================================================================== --- trunk/BOOK/xsoft/graphweb/galeon.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/xsoft/graphweb/galeon.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -80,15 +80,17 @@ <title>Installation of Galeon</title> <para>Compiling must be done with the same compiler version and - optimization settings that were used to compile the Gecko rendering + optimization settings that were used to compile the Gecko layout engine package.</para> <para>Install <application>Galeon</application> by running the following commands:</para> -<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \ +<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \ --sysconfdir=&gnome-etc-dir; \ - --localstatedir=/var/lib && + --localstatedir=/var/lib \ + --mandir=$(pkg-config \ + --variable=prefix ORBit-2.0)/share/man && make</userinput></screen> <para>This package does not come with a test suite.</para> @@ -96,15 +98,32 @@ <para>Now, as the <systemitem class="username">root</systemitem> user:</para> <screen role='root'><userinput>make install && -install -v -m755 -d \ - `pkg-config --variable=prefix ORBit-2.0`/share/doc/galeon-&galeon-version; && -install -v -m644 FAQ README* doc/*.txt \ - `pkg-config --variable=prefix ORBit-2.0`/share/doc/galeon-&galeon-version; && -ln -v -s ../../$PACKAGE_NAME/FAQ.html \ - `pkg-config --variable=prefix ORBit-2.0`/share/doc/galeon-&galeon-version;</userinput></screen> +install -v -m755 -d $(pkg-config \ + --variable=prefix ORBit-2.0)/share/doc/galeon-&galeon-version; && +install -v -m644 FAQ README* doc/*.txt $(pkg-config \ + --variable=prefix ORBit-2.0)/share/doc/galeon-&galeon-version; && +ln -v -s ../../$PACKAGE_NAME/FAQ.html $(pkg-config \ + --variable=prefix ORBit-2.0)/share/doc/galeon-&galeon-version;</userinput></screen> </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gnome-sysconfdir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/scrollkeeper-dir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gnome-mandir.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> @@ -116,8 +135,8 @@ <seglistitem> <seg>galeon and galeon-config-tool</seg> <seg>None</seg> - <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/galeon - and the following subdirectories of $GNOME_PREFIX/share/: + <seg>The following subdirectories of + <envar>$GNOME_PREFIX</envar>/share/: galeon, {gnome/help, omf, sounds}/galeon</seg> </seglistitem> </segmentedlist> Modified: trunk/BOOK/xsoft/office/evolution.xml =================================================================== --- trunk/BOOK/xsoft/office/evolution.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/xsoft/office/evolution.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -131,8 +131,8 @@ </note> <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \ + --sysconfdir=&gnome-etc-dir; \ --localstatedir=/var/lib \ - --sysconfdir=&gnome-etc-dir; \ --libexecdir=$(pkg-config \ --variable=prefix ORBit-2.0)/lib \ --enable-nntp \ @@ -160,6 +160,22 @@ you wish to build and install the documentation.</para> --> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gnome-sysconfdir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/scrollkeeper-dir.xml"/> + + <para><parameter>--libexecdir=$(pkg-config --variable=prefix + ORBit-2.0)/lib</parameter>: This parameter causes the libexec + files to be installed in the preferred location of + <filename class="directory">$GNOME_PREFIX/lib/evolution</filename> instead + of <filename + class="directory">$GNOME_PREFIX/libexec/evolution</filename>.</para> + <para><parameter>--enable-nntp</parameter>: This parameter is used to build the Usenet news (NNTP) backend.</para> @@ -210,7 +226,7 @@ <seg>evolution and evolution-2.6</seg> <seg>$GNOME_PREFIX/lib/evolution/2.6/* (contains support libraries, conduits, and other components)</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/evolution-2.6, lib/evolution, share/{{,omf/}evolution, {gnome/help,idl}/evolution-2.6}</seg> Modified: trunk/BOOK/xsoft/office/gimp.xml =================================================================== --- trunk/BOOK/xsoft/office/gimp.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/xsoft/office/gimp.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -9,8 +9,8 @@ <!ENTITY gimp-md5sum "0403e9b4e0415c99cd27b137b9839212"> <!ENTITY gimp-size "12.3 MB"> <!ENTITY gimp-buildsize "501 MB (includes installing the help system)"> - <!ENTITY gimp-time "5.5 SBU (additional 0.8 SBU to run test suite - and additional 8.2 SBU to build help files)"> + <!ENTITY gimp-time "5.5 SBU (additional 0.8 SBU to run the test suite + and additional 8.2 SBU to build the help files)"> <!ENTITY gimp-help-version "0.10"> <!ENTITY gimp-help-download "ftp://ftp.gimp.org/pub/gimp/help/gimp-help-2-&gimp-help-version;.tar.gz";> @@ -111,7 +111,8 @@ <xref linkend="alsa"/>, and <ulink url="http://wvware.sourceforge.net/libwmf.html";>libwmf</ulink></para> - <bridgehead renderas="sect4">Optional (for Building Documentation from the Help Tarball)</bridgehead> + <bridgehead renderas="sect4">Optional (for Building Documentation from + the Help Tarball)</bridgehead> <para role="optional"> <xref linkend="libxslt"/>, <xref linkend="DocBook"/>, @@ -182,6 +183,9 @@ <para><parameter>--without-libtiff</parameter>: This option is necessary if <application>libtiff</application> is not installed.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gtk-doc-rebuild.xml"/> + </sect2> <sect2 role="configuration"> Modified: trunk/BOOK/xsoft/office/gnucash.xml =================================================================== --- trunk/BOOK/xsoft/office/gnucash.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/xsoft/office/gnucash.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -174,6 +174,9 @@ files in <filename class='directory'>/etc/gnucash</filename> instead of <filename class='directory'>/opt/gnome-1.4/etc/gnucash</filename>.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/scrollkeeper-dir.xml"/> + <para><parameter>--disable-guppi</parameter>: This compiles <application>GnuCash</application> without support for creating GUI graphs and plots. Remove this option if you have Modified: trunk/BOOK/xsoft/office/gnumeric.xml =================================================================== --- trunk/BOOK/xsoft/office/gnumeric.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/xsoft/office/gnumeric.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -94,8 +94,8 @@ commands:</para> <screen><userinput>./configure --prefix=/usr \ - --localstatedir=/var/lib \ - --sysconfdir=&gnome-etc-dir; && + --sysconfdir=&gnome-etc-dir; \ + --localstatedir=/var/lib && make</userinput></screen> <para>This package does not come with a test suite.</para> @@ -155,18 +155,11 @@ <sect2 role="commands"> <title>Command Explanations</title> - <para><parameter>--localstatedir=/var/lib</parameter>: This switch puts - <application>ScrollKeeper</application> files in - <filename class="directory">/var/lib/scrollkeeper</filename> instead of - <filename class="directory">/usr/var/scrollkeeper</filename>. This - switch may not be applicable if you don't have <xref linkend="yelp"/> - installed, but won't affect the build otherwise.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gnome-sysconfdir.xml"/> - <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts - configuration files in <filename class="directory">&gnome-etc-dir;</filename> - instead of <filename class="directory">/usr/etc</filename>. This - switch may not be applicable if you don't have <xref linkend="GConf"/> - installed, but won't affect the build otherwise.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/scrollkeeper-dir.xml"/> <para><parameter>--prefix=$(pkg-config --variable=prefix gnome-doc-utils)</parameter>: @@ -191,8 +184,7 @@ <seg>gnumeric, gnumeric-&gnumeric-version;, and ssconvert</seg> <seg>numerous filters, plugins and <application>GNOME</application> components</seg> - <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas/}apps/gnumeric, - /usr/lib/gnumeric, + <seg>/usr/lib/gnumeric, /usr/share/doc/gnumeric-&gnumeric-version;, and /usr/share/{{,gnome/help/, omf/, pixmaps/}gnumeric,mc}</seg> </seglistitem> Modified: trunk/BOOK/xsoft/other/balsa.xml =================================================================== --- trunk/BOOK/xsoft/other/balsa.xml 2006-06-26 10:37:33 UTC (rev 6215) +++ trunk/BOOK/xsoft/other/balsa.xml 2006-06-26 15:45:37 UTC (rev 6216) @@ -96,8 +96,10 @@ commands:</para> <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \ + --sysconfdir=&gnome-etc-dir; \ --localstatedir=/var/lib \ - --sysconfdir=&gnome-etc-dir; \ + --mandir=$(pkg-config \ + --variable=prefix ORBit-2.0)/share/man && --with-gtkhtml=no \ --with-esmtp=no && make</userinput></screen> @@ -113,15 +115,18 @@ <sect2 role="commands"> <title>Command Explanations</title> - <para><parameter>--localstatedir=/var/lib</parameter>: This switch puts - <application>ScrollKeeper</application> files in - <filename class="directory">/var/lib/scrollkeeper</filename> instead of - <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gnome-prefix.xml"/> - <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts - configuration files in <filename class="directory">&gnome-etc-dir;</filename> - instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gnome-sysconfdir.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/scrollkeeper-dir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; + href="../../xincludes/gnome-mandir.xml"/> + <para><parameter>--with-gtkhtml=no</parameter>: This parameter is used if you don't have <application>libgtkhtml</application> installed. Remove this parameter if the package is installed. Note that you won't be able to @@ -180,7 +185,8 @@ <seglistitem> <seg>balsa and balsa-ab</seg> <seg>None</seg> - <seg>The following subdirectories of $GNOME_PREFIX/share/: + <seg>The following subdirectories of + <envar>$GNOME_PREFIX</envar>/share/: {gnome/help, omf, sounds}/balsa</seg> </seglistitem> </segmentedlist> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
