diff options
| author | Randy McMurchy <randy@linuxfromscratch.org> | 2006-06-25 19:48:15 +0000 |
|---|---|---|
| committer | Randy McMurchy <randy@linuxfromscratch.org> | 2006-06-25 19:48:15 +0000 |
| commit | 551b93899a928215226a0b6ab0b347c794d29983 (patch) | |
| tree | 3719a3bf4fb66762f25e2249c3dd0d5467dd51b7 /gnome | |
| parent | 7539d8f75dfae276ad858443fa652eefd15d0dca (diff) | |
Minor fixes and clean-up to the core GNOME-2 package instructions including standardizing the text in the 'Command Explanations' section by using xinclude files and changing the creation of symbolic links to using PYTHONPATH so Python can find modules installed in non-standard locations
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6211 af4574ff-66df-0310-9fd7-8a98e5e911e0
Diffstat (limited to 'gnome')
27 files changed, 344 insertions, 203 deletions
diff --git a/gnome/core/control-center.xml b/gnome/core/control-center.xml index a5f46b3c1f..ceb2e9b4e9 100644 --- a/gnome/core/control-center.xml +++ b/gnome/core/control-center.xml @@ -88,8 +88,8 @@ following commands:</para> <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \ - --localstatedir=/var/lib \ --sysconfdir=&gnome-etc-dir; \ + --localstatedir=/var/lib \ --libexecdir=$(pkg-config \ --variable=prefix ORBit-2.0)/lib/control-center && make</userinput></screen> @@ -105,21 +105,22 @@ make</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../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/control-center</parameter>: This switch puts libexec files in + ORBit-2.0)/lib/control-center</parameter>: This parameter causes the libexec + files to be installed in the preferred location of <filename class="directory">$GNOME_PREFIX/lib/control-center</filename> instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para> - <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> - - <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> - <para><option>--enable-aboutme</option>: Enables building the <command>gnome-about-me</command> capplet. <application>Evolution Data Server</application> must be installed to use this parameter.</para> @@ -148,7 +149,7 @@ make</userinput></screen> <application>GNOME VFS</application> and window manager settings library modules and <application>Nautilus</application> library module extensions</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/gnome-window-settings-2.0, lib/{control-center, nautilus, window-manager-settings}, share/{{,gnome/help/,omf/}control-center-2.0, diff --git a/gnome/core/eel.xml b/gnome/core/eel.xml index dca149f30c..6d90661933 100644 --- a/gnome/core/eel.xml +++ b/gnome/core/eel.xml @@ -87,6 +87,14 @@ make</userinput></screen> </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> @@ -98,7 +106,7 @@ make</userinput></screen> <seglistitem> <seg>None</seg> <seg>libeel-2.{so,a}</seg> - <seg>$GNOME_PREFIX/include/eel-2</seg> + <seg><envar>$GNOME_PREFIX</envar>/include/eel-2</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/gail.xml b/gnome/core/gail.xml index fca9cd7093..ffd9d18f43 100644 --- a/gnome/core/gail.xml +++ b/gnome/core/gail.xml @@ -99,14 +99,16 @@ make</userinput></screen> </sect2> - <!-- <sect2 role="commands"> + <sect2 role="commands"> <title>Command Explanations</title> - <para><option>-enable-gtk-doc</option>: Use this parameter if you have - <application>GTK-Doc</application> installed and wish to build the API - documentation as the source tarball doesn't contain pre-built docs.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> - </sect2> --> + </sect2> <sect2 role="content"> <title>Contents</title> @@ -120,9 +122,9 @@ make</userinput></screen> <seg>None</seg> <seg>libgailutil.so and <application>GAIL</application> <application>GTK+</application> modules</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/gail-1.0, - lib/gtk-2.0/modules, and + lib/gtk-2.0/modules and share/gtk-doc/html/gail-libgail-util</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/gconf.xml b/gnome/core/gconf.xml index ba5e5fce25..2a79102c90 100644 --- a/gnome/core/gconf.xml +++ b/gnome/core/gconf.xml @@ -97,20 +97,30 @@ make</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter + causes the <application>GConf-2</application> configuration database to be + built in <filename class="directory">&gnome-etc-dir;</filename> instead of + <filename class="directory">$GNOME_PREFIX/etc</filename>. This installation + controls all future installations of <application>GConf-2</application> + schemas. If you change the location (which includes eliminating this + parameter), it <emphasis role='strong'>must</emphasis> be consistent for + every subsequent package installation that updates the + <application>GConf-2</application> configuration database.</para> + <para><parameter>--libexecdir=$(pkg-config --variable=prefix - ORBit-2.0)/lib/GConf</parameter>: This switch puts libexec files in + ORBit-2.0)/lib/GConf</parameter>: This parameter causes the libexec files + to be installed in the preferred location of <filename class="directory">$GNOME_PREFIX/lib/GConf</filename> instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para> - <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch - puts <application>GConf-2</application> configuration files - in <filename class="directory">&gnome-etc-dir;</filename> instead of - <filename class="directory">$GNOME_PREFIX/etc</filename>. This - installation controls all future installations of schemas. If you - change the location (which includes eliminating this parameter), it - <emphasis>must</emphasis> be consistent for every subsequent - package installation that updates the <application>GConf-2</application> - configuration database.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-mandir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> </sect2> @@ -126,9 +136,9 @@ make</userinput></screen> <seg>gconf-merge-tree and gconftool-2</seg> <seg>libgconf-2.{so,a}</seg> <seg>&gnome-etc-dir;/gconf and the following subdirectories of - $GNOME_PREFIX/: + <envar>$GNOME_PREFIX</envar>/: include/gconf, - lib/GConf, and + lib/GConf and share/{GConf, gtk-doc/html/gconf, sgml/gconf}</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/gnome-applets.xml b/gnome/core/gnome-applets.xml index 2366f9c49d..8547f629a3 100644 --- a/gnome/core/gnome-applets.xml +++ b/gnome/core/gnome-applets.xml @@ -69,11 +69,8 @@ <xref linkend="gucharmap"/>, <xref linkend="system-tools-backends"/>, <xref linkend="docbook-utils"/>, - <ulink - url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink>, - and <ulink - url="http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.2.2.tar.gz"> - libnotify-0.2.2</ulink></para> + <ulink url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink>, and + <ulink url="http://www.galago-project.org/news/index.php">libnotify</ulink></para> <para condition="html" role="usernotes">User Notes: <ulink url="&blfs-wiki;/gnome-applets"/></para> @@ -87,8 +84,8 @@ running the following commands:</para> <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \ - --localstatedir=/var/lib \ --sysconfdir=&gnome-etc-dir; \ + --localstatedir=/var/lib \ --libexecdir=$(pkg-config \ --variable=prefix ORBit-2.0)/lib/gnome-applets \ --mandir=$(pkg-config \ @@ -107,23 +104,28 @@ make -C man install-man</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../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/gnome-applets</parameter>: This switch puts libexec files + ORBit-2.0)/lib/gnome-applets</parameter>: This parameter causes the libexec + files to be installed in the preferred location of in <filename class="directory">$GNOME_PREFIX/lib/gnome-applets</filename> instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para> - <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> - - <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="../gnome-mandir.xml"/> - <para><command>make -C man install-man</command>: This installs the man-pages - that are not installed during <command>make install</command>.</para> + <para><command>make -C man install-man</command>: This command installs + the man-pages that are not installed during + <command>make install</command>.</para> </sect2> @@ -138,12 +140,11 @@ make -C man install-man</userinput></screen> <seglistitem> <seg>cpufreq-selector and gswitchit-plugins-capplet</seg> <seg>None</seg> - <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas}apps/{too - many to list} and the following subdirectories of $GNOME_PREFIX/: - include/libgswitchit, + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: + include/libg{switchit,weather}, lib/gnome-applets, share/{gnome-applets, {gnome/help,omf}/{too many to list}, - pixmaps/{accessx-status-applet, cpufreq-applet, stickynotes}, and + pixmaps/{accessx-status-applet, cpufreq-applet, stickynotes}, xmodmap}</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/gnome-backgrounds.xml b/gnome/core/gnome-backgrounds.xml index 18ad155ccf..8eb511f29f 100644 --- a/gnome/core/gnome-backgrounds.xml +++ b/gnome/core/gnome-backgrounds.xml @@ -30,8 +30,10 @@ <title>Introduction to gnome-backgrounds</title> <para>The <application>gnome-backgrounds</application> package contains - a set of backgrounds used in the <application>GNOME</application> - desktop.</para> + a collection of graphics files which can be used as backgrounds in the + GNOME desktop environment. Additionally, the package creates the proper + framework and directory structure so that you can add your own files to + the collection.</para> <bridgehead renderas="sect3">Package Information</bridgehead> <itemizedlist spacing="compact"> @@ -88,6 +90,14 @@ make</userinput></screen> </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> @@ -99,7 +109,7 @@ make</userinput></screen> <seglistitem> <seg>None</seg> <seg>None</seg> - <seg>$GNOME_PREFIX/share/{gnome-background-properties, + <seg><envar>$GNOME_PREFIX</envar>/share/{gnome-background-properties, pixmaps/backgrounds}</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/gnome-desktop.xml b/gnome/core/gnome-desktop.xml index 783fb48c96..4495d59029 100644 --- a/gnome/core/gnome-desktop.xml +++ b/gnome/core/gnome-desktop.xml @@ -94,9 +94,14 @@ make</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> - <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="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-sysconfdir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/scrollkeeper-dir.xml"/> <para><option>--with-gnome-distributor="Some Name"</option>: Use this parameter to supply a custom name in the <quote>Distributor:</quote> @@ -106,6 +111,12 @@ make</userinput></screen> parameter if <application>KDE</application> is installed in any prefix other than <filename class='directory'>/usr</filename>.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-mandir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> + </sect2> <sect2 role="content"> @@ -119,7 +130,7 @@ make</userinput></screen> <seglistitem> <seg>gnome-about</seg> <seg>libgnome-desktop-2.{so,a}</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/gnome-desktop-2.0, share/{gnome-about, {gnome/help,omf}/{fdl,gnome-feedback,gpl,lgpl}, diff --git a/gnome/core/gnome-doc-utils.xml b/gnome/core/gnome-doc-utils.xml index c5fa366ac0..a8c30d9c4e 100644 --- a/gnome/core/gnome-doc-utils.xml +++ b/gnome/core/gnome-doc-utils.xml @@ -68,10 +68,12 @@ <para role="required"><xref linkend="python"/> and <xref linkend="scrollkeeper"/></para> - <para>The packages are listed as recommended because if they are not - installed (and the proper switches are passed to the - <command>configure</command> command), functionality will be missing that - is expected later in other GNOME packages.</para> + <para>The packages are listed as recommended even though + <application>GNOME Doc Utils</application> will build fine without them. + If you don't install the recommended packages (and you pass the appropriate + flags to the <command>configure</command> command so that it will build + without them), functionality will be missing that is expected later in + other GNOME packages.</para> <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"><xref linkend="pkgconfig"/></para> @@ -103,6 +105,17 @@ make</userinput></screen> </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-mandir.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> @@ -115,7 +128,8 @@ make</userinput></screen> <seglistitem> <seg>gnome-doc-prepare and xml2po</seg> <seg>None</seg> - <seg>The following subdirectories of $GNOME_PREFIX/share/: + <seg>The following subdirectories of + <envar>$GNOME_PREFIX</envar>/share/: gnome-doc-utils, gnome/help/gnome-doc-{make,xslt}, omf/gnome-doc-{make,xslt}, diff --git a/gnome/core/gnome-keyring.xml b/gnome/core/gnome-keyring.xml index 121abf0f69..c49c92b071 100644 --- a/gnome/core/gnome-keyring.xml +++ b/gnome/core/gnome-keyring.xml @@ -93,8 +93,12 @@ install -v -m644 *.txt $(pkg-config \ <sect2 role="commands"> <title>Command Explanations</title> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + <para><parameter>--libexecdir=$(pkg-config --variable=prefix - ORBit-2.0)/lib/gnome-keyring</parameter>: This switch puts libexec files in + ORBit-2.0)/lib/gnome-keyring</parameter>: This parameter causes the libexec + files to be installed in the preferred location of <filename class="directory">$GNOME_PREFIX/lib/gnome-keyring</filename> instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para> @@ -105,14 +109,14 @@ install -v -m644 *.txt $(pkg-config \ <title>Contents</title> <segmentedlist> - <segtitle>Installed Programs</segtitle> + <segtitle>Installed Program</segtitle> <segtitle>Installed Library</segtitle> - <segtitle>Installed Directory</segtitle> + <segtitle>Installed Directories</segtitle> <seglistitem> <seg>gnome-keyring-daemon</seg> <seg>libgnome-keyring.so</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/gnome-keyring-1, lib/gnome-keyring and share/doc/gnome-keyring-&gnome-keyring-version;</seg> diff --git a/gnome/core/gnome-menus.xml b/gnome/core/gnome-menus.xml index 5982f142d9..c3d830e146 100644 --- a/gnome/core/gnome-menus.xml +++ b/gnome/core/gnome-menus.xml @@ -94,17 +94,16 @@ make</userinput></screen> <screen role="root"><userinput>make install</userinput></screen> - <para>If your <application>GNOME</application>-2 installation prefix is - anything other than <filename class='directory'>/usr</filename> and you - have <application>Python</application> installed, create some symbolic - links as the <systemitem class="username">root</systemitem> user:</para> - -<screen role="root"><userinput>ln -v -s $(pkg-config --variable=prefix \ - ORBit-2.0)/lib/python2.4/site-packages/GMenuSimpleEditor \ - /usr/lib/python2.4/site-packages && -ln -v -s $(pkg-config --variable=prefix \ - ORBit-2.0)/lib/python2.4/site-packages/gmenu.* \ - /usr/lib/python2.4/site-packages</userinput></screen> + </sect2> + + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-sysconfdir.xml"/> </sect2> @@ -114,14 +113,37 @@ ln -v -s $(pkg-config --variable=prefix \ <sect3> <title>Configuration Information</title> - <para>So that <application>GNOME</application> can find the desktop - configuration files, ensure you set the <envar>XDG_CONFIG_DIRS</envar> - environment variable in the system profile, or in individual user's - profiles as shown below (you may add additional directories, separated - with colons, if desired):</para> + <sect4> + <title>XDG_CONFIG_DIRS Variable</title> + + <para>So that <application>GNOME</application> can find the desktop + configuration files, ensure you set the <envar>XDG_CONFIG_DIRS</envar> + environment variable in the system profile, or in individual user's + profiles as shown below (you may add additional directories, separated + with colons, if desired):</para> <screen><literal>export XDG_CONFIG_DIRS=/usr/share:&gnome-etc-dir;/xdg</literal></screen> + </sect4> + + <sect4> + <title>PYTHONPATH Variable</title> + + <para>If your GNOME-2 installation prefix is anything other than + <filename class='directory'>/usr</filename> and you have + <application>Python</application> installed, you need to update the + <envar>PYTHONPATH</envar> environment variable so that the + <filename>gmenu</filename> module can be located by + <application>Python</application>. Set the variable in the system + profile, or in individual user's profiles as shown below:</para> + +<screen><literal>export PYTHONPATH=$PYTHONPATH:$(pkg-config --variable=prefix \ + ORBit-2.0)/lib/python2.4/site-packages:$(pkg-config \ + --variable=prefix \ + ORBit-2.0)/lib/python2.4/site-packages/GMenuSimpleEditor</literal></screen> + + </sect4> + </sect3> </sect2> @@ -130,7 +152,7 @@ ln -v -s $(pkg-config --variable=prefix \ <title>Contents</title> <segmentedlist> - <segtitle>Installed Program</segtitle> + <segtitle>Installed Programs</segtitle> <segtitle>Installed Library</segtitle> <segtitle>Installed Directories</segtitle> @@ -138,7 +160,7 @@ ln -v -s $(pkg-config --variable=prefix \ <seg>gmenu-simple-editor and gnome-menu-spec-test</seg> <seg>libgnome-menu.{so,a}</seg> <seg>&gnome-etc-dir;/xdg and the following subdirectories of - $GNOME_PREFIX/: + <envar>$GNOME_PREFIX</envar>/: include/gnome-menus, lib/python2.4/site-packages/GMenuSimpleEditor, share/{desktop-directories, gnome-menus}</seg> diff --git a/gnome/core/gnome-mime-data.xml b/gnome/core/gnome-mime-data.xml index 425822b3ba..73db26fcba 100644 --- a/gnome/core/gnome-mime-data.xml +++ b/gnome/core/gnome-mime-data.xml @@ -94,14 +94,14 @@ install -v -m644 -D man/gnome-vfs-mime.5 \ <sect2 role="commands"> <title>Command Explanations</title> - <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="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-sysconfdir.xml"/> - <para><parameter>--mandir=...</parameter>: This switch is unneeded and may - be removed as the man page is installed manually. It is only in the - instructions in case the man page is ever installed during - <command>make install</command>.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-mandir.xml"/> </sect2> @@ -116,7 +116,8 @@ install -v -m644 -D man/gnome-vfs-mime.5 \ <seglistitem> <seg>None</seg> <seg>None</seg> - <seg>$GNOME_PREFIX/share/{application-registry, share/mime-info}</seg> + <seg><envar>$GNOME_PREFIX</envar>/share/{application-registry, + share/mime-info}</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/gnome-panel.xml b/gnome/core/gnome-panel.xml index 130c6ef441..9a63e97937 100644 --- a/gnome/core/gnome-panel.xml +++ b/gnome/core/gnome-panel.xml @@ -80,8 +80,8 @@ running the following commands:</para> <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \ - --localstatedir=/var/lib \ --sysconfdir=&gnome-etc-dir; \ + --localstatedir=/var/lib \ --libexecdir=$(pkg-config \ --variable=prefix ORBit-2.0)/lib/gnome-panel \ --mandir=$(pkg-config \ @@ -99,15 +99,27 @@ make</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../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/gnome-panel</parameter>: This switch puts libexec files in + ORBit-2.0)/lib/gnome-panel</parameter>: This parameter causes the libexec + files to be installed in the preferred location of <filename class="directory">$GNOME_PREFIX/lib/gnome-panel</filename> instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para> - <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="../gnome-mandir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> </sect2> @@ -116,13 +128,13 @@ make</userinput></screen> <segmentedlist> <segtitle>Installed Programs</segtitle> - <segtitle>Installed Libraries</segtitle> + <segtitle>Installed Library</segtitle> <segtitle>Installed Directories</segtitle> <seglistitem> <seg>gnome-desktop-item-edit, gnome-panel and panel-test-applets</seg> <seg>libpanel-applet-2.{so,a}</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/panel-2.0, lib/gnome-panel, share/{gnome/{help/{too many to list}, panel}, diff --git a/gnome/core/gnome-session.xml b/gnome/core/gnome-session.xml index 1e2f9852ab..406ea2c809 100644 --- a/gnome/core/gnome-session.xml +++ b/gnome/core/gnome-session.xml @@ -92,9 +92,14 @@ make</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> - <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="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-sysconfdir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-mandir.xml"/> </sect2> @@ -104,13 +109,13 @@ make</userinput></screen> <segmentedlist> <segtitle>Installed Programs</segtitle> <segtitle>Installed Libraries</segtitle> - <segtitle>Installed Directories</segtitle> + <segtitle>Installed Directory</segtitle> <seglistitem> <seg>gnome-session, gnome-session-properties, gnome-session-remove, gnome-session-save, and gnome-wm</seg> <seg>None</seg> - <seg>$GNOME_PREFIX/share/pixmaps/splash</seg> + <seg><envar>$GNOME_PREFIX</envar>/share/pixmaps/splash</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/gnome-terminal.xml b/gnome/core/gnome-terminal.xml index 23ef4f88dc..811688e60b 100644 --- a/gnome/core/gnome-terminal.xml +++ b/gnome/core/gnome-terminal.xml @@ -74,8 +74,8 @@ running the following commands:</para> <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \ - --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> @@ -89,14 +89,14 @@ make</userinput></screen> <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="../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="../gnome-sysconfdir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/scrollkeeper-dir.xml"/> </sect2> @@ -111,7 +111,7 @@ make</userinput></screen> <seglistitem> <seg>gnome-terminal</seg> <seg>None</seg> - <seg>$GNOME_PREFIX/share/{,gnome/help/,omf/}gnome-terminal</seg> + <seg><envar>$GNOME_PREFIX</envar>/share/{,gnome/help/,omf/}gnome-terminal</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/gnome-user-docs.xml b/gnome/core/gnome-user-docs.xml index 53d3612c46..df459cb741 100644 --- a/gnome/core/gnome-user-docs.xml +++ b/gnome/core/gnome-user-docs.xml @@ -90,10 +90,11 @@ make</userinput></screen> <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="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/scrollkeeper-dir.xml"/> </sect2> @@ -108,7 +109,8 @@ make</userinput></screen> <seglistitem> <seg>None</seg> <seg>None</seg> - <seg>$GNOME_PREFIX/share/{gnome/help/{gnome-access-guide,system-admin-guide,user-guide}, + <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/{gnome-access-guide, + system-admin-guide, user-guide}, omf/{gnome-user-docs,user-guide}}</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/gnome-vfs.xml b/gnome/core/gnome-vfs.xml index ac9cba6c16..c499ed1f66 100644 --- a/gnome/core/gnome-vfs.xml +++ b/gnome/core/gnome-vfs.xml @@ -81,11 +81,11 @@ <ulink url="http://www.avahi.org">Avahi</ulink></para> <para>If you run <command>./configure --help</command> for the complete - list of dependency requirements and available switches, you may notice a + list of dependency requirements and available parameters, you may notice a message about the <xref linkend="gnome-mount"/> package. This package is not required at build-time, and is only a run-time dependency. If <application>gnome-mount</application> is available at run-time, - <application>GNOME-VFS</application> will use it. If not available, + <application>GNOME-VFS</application> will use it. If it is not available, <application>GNOME-VFS</application> will fall back to using other mounting mechanisms.</para> @@ -117,33 +117,28 @@ make</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> - <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="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-sysconfdir.xml"/> <para><parameter>--libexecdir=$(pkg-config --variable=prefix - ORBit-2.0)/lib/gnome-vfs-2.0</parameter>: This switch puts libexec files in + ORBit-2.0)/lib/gnome-vfs-2.0</parameter>: This parameter causes the libexec + files to be installed in the preferred location of <filename class="directory">$GNOME_PREFIX/lib/gnome-vfs-2.0</filename> instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para> - <!-- Apparently fixed - <para><command>rmdir $(pkg-config -variable=prefix ORBit-2.0)/doc</command>: - Use this command if <envar>$GNOME_PREFIX</envar> is anything other than - <filename class='directory'>/usr</filename> as the directory is unneeded and - unpopulated.</para> --> - <para><option>--with-hal-eject=PROGRAM</option>: This parameter does not need to be passed if you have <ulink url="http://ca.geocities.com/jefftranter@rogers.com/eject.html">Eject</ulink> or <xref linkend="gnome-mount"/> installed, as the <command>eject</command> - program is used if gnome-mount is not installed.</para> + program is used if <application>gnome-mount</application> is not + installed.</para> - <!-- Commenting this out for now as the documentation is already built - and installed by default - <para><option>-enable-gtk-doc</option>: Use this option if you have - <application>GTK-Doc</application> installed and wish to build the API - documentation.</para> --> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> </sect2> @@ -161,7 +156,8 @@ make</userinput></screen> <seg>libgnomevfs-2.{so,a} and modules</seg> <seg>The following subdirectories of &gnome-etc-dir;/: gconf/{schemas, gconf.xml.defaults/{desktop, schemas, system}, - gnome-vfs-2.0} and the following subdirectories of $GNOME_PREFIX/: + gnome-vfs-2.0} and the following subdirectories of + <envar>$GNOME_PREFIX</envar>/: include/gnome-vfs-{,module-}2.0, lib/gnome-vfs{,-2.0}, share/gtk-doc/html/gnome-vfs-2.0</seg> diff --git a/gnome/core/gtk-engines.xml b/gnome/core/gtk-engines.xml index 8ef73afb0d..0d0d38dc72 100644 --- a/gnome/core/gtk-engines.xml +++ b/gnome/core/gtk-engines.xml @@ -94,7 +94,7 @@ make</userinput></screen> <seglistitem> <seg>None</seg> <seg><application>GTK-2</application> engines libraries</seg> - <seg>/usr/lib/gtk-2.0/engines and /usr/share/themes/{theme name}</seg> + <seg>/usr/lib/gtk-2.0/engines and /usr/share/themes/{theme names}</seg> <seg>Clearlooks, Crux, Industrial, LighthouseBlue, Metal, Mist, Redmond and ThinIce</seg> </seglistitem> diff --git a/gnome/core/libbonobo.xml b/gnome/core/libbonobo.xml index bd6a9af556..4b9172868a 100644 --- a/gnome/core/libbonobo.xml +++ b/gnome/core/libbonobo.xml @@ -97,22 +97,23 @@ make</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> - <para><parameter>--prefix=$(pkg-config --variable=prefix - ORBit-2.0)</parameter>: Setting the prefix with this command instead of - with <envar>GNOME_PREFIX</envar> will ensure that the prefix is - consistent with the installation environment.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-sysconfdir.xml"/> <para><parameter>--libexecdir=$(pkg-config --variable=prefix - ORBit-2.0)/lib/bonobo</parameter>: This switch puts libexec files in + ORBit-2.0)/lib/bonobo</parameter>: This parameter causes the libexec + files to be installed in the preferred location of <filename class="directory">$GNOME_PREFIX/lib/bonobo</filename> instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para> - <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="../gnome-mandir.xml"/> - <para><option>--enable-gtk-doc</option>: This switch rebuilds the - 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> @@ -132,7 +133,7 @@ make</userinput></screen> <application>ORBit-2</application> bonobo module, bonobo servers, and libmoniker_std_2.{so,a} bonobo library</seg> <seg>&gnome-etc-dir;/bonobo-activation and the following subdirectories - of $GNOME_PREFIX/: + of <envar>$GNOME_PREFIX</envar>/: include/{bonobo-activation-2.0,libbonobo-2.0}, lib/{bonobo{,-2.0},libbonobo}, and share/{gtk-doc/html/{bonobo-activation,libbonobo}, diff --git a/gnome/core/libbonoboui.xml b/gnome/core/libbonoboui.xml index 7dc6e693af..709b18843a 100644 --- a/gnome/core/libbonoboui.xml +++ b/gnome/core/libbonoboui.xml @@ -84,9 +84,19 @@ make</userinput></screen> <screen role="root"><userinput>make install && install -v -m755 -d $(pkg-config \ --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version; && -install -v -m644 doc/*.{dtd,txt,xml,html} \ - $(pkg-config \ - --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version;</userinput></screen> +install -v -m644 doc/*.{dtd,txt,xml,html} $(pkg-config \ + --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version;</userinput></screen> + + </sect2> + + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> </sect2> @@ -101,8 +111,8 @@ install -v -m644 doc/*.{dtd,txt,xml,html} \ <seglistitem> <seg>bonobo-browser and test-moniker</seg> <seg>libbonoboui-2.{so,a} and libbonobo.{so,a} Glade library</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: - include/libbonoboui-2.0 and + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: + include/libbonoboui-2.0, share/{doc/libbonoboui-&libbonoboui-version;, gnome-2.0, gtk-doc/html/libbonoboui}</seg> </seglistitem> diff --git a/gnome/core/libgnome.xml b/gnome/core/libgnome.xml index f2fae91a64..752879f7de 100644 --- a/gnome/core/libgnome.xml +++ b/gnome/core/libgnome.xml @@ -93,18 +93,26 @@ make</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> - <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="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-sysconfdir.xml"/> <para><parameter>--localstatedir=/var/lib</parameter>: This - switch sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to + parameter sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to <filename class='directory'>/var/lib</filename> instead of <filename class='directory'>$GNOME_PREFIX/var</filename> to synchronize with the <application>GNOME Games</application> installation and properly record high scores in <filename class='directory'>/var/lib/games</filename>.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-mandir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> + </sect2> <sect2 role="content"> @@ -120,7 +128,7 @@ make</userinput></screen> <seg>libgnome-2.{so,a} and the libmoniker_extra_2.{so,a} bonobo library</seg> <seg>&gnome-etc-dir;/sound, - and the following subdirectories of $GNOME_PREFIX/: + and the following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/libgnome-2.0, share/gtk-doc/html/libgnome</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/libgnomecanvas.xml b/gnome/core/libgnomecanvas.xml index 63eece6a0b..a9cf5e1ffe 100644 --- a/gnome/core/libgnomecanvas.xml +++ b/gnome/core/libgnomecanvas.xml @@ -90,6 +90,17 @@ make</userinput></screen> </sect2> + <sect2 role="commands"> + <title>Command Explanations</title> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> + + </sect2> + <sect2 role="content"> <title>Contents</title> @@ -102,9 +113,9 @@ make</userinput></screen> <seg>None</seg> <seg>libgnomecanvas-2.{so,a} and the libcanvas.{so,a} Glade library</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/libgnomecanvas-2.0, - lib/libglade, and + lib/libglade and share/gtk-doc/html/libgnomecanvas</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/libgnomeui.xml b/gnome/core/libgnomeui.xml index 6b4dad0a88..e29115fb74 100644 --- a/gnome/core/libgnomeui.xml +++ b/gnome/core/libgnomeui.xml @@ -101,8 +101,12 @@ make</userinput></screen> <sect2 role="commands"> <title>Command Explanations</title> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + <para><parameter>--libexecdir=$(pkg-config --variable=prefix - ORBit-2.0)/lib/libgnomeui</parameter>: This switch puts libexec files in + ORBit-2.0)/lib/libgnomeui</parameter>: This parameter causes the libexec + files to be installed in the preferred location of <filename class="directory">$GNOME_PREFIX/lib/libgnomeui</filename> instead of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para> @@ -110,6 +114,9 @@ make</userinput></screen> parameter if you have <application>KDE</application> installed in any prefix other than <filename class='directory'>/usr</filename>.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> + </sect2> <sect2 role="configuration"> @@ -137,7 +144,7 @@ make</userinput></screen> <title>Contents</title> <segmentedlist> - <segtitle>Installed Program</segtitle> + <segtitle>Installed Programs</segtitle> <segtitle>Installed Libraries</segtitle> <segtitle>Installed Directories</segtitle> @@ -145,9 +152,9 @@ make</userinput></screen> <seg></seg> <seg>libgnomeui-2.{so,a}, the libgnome.{so,a} Glade library, and the libgnome-vfs.{so,a} <application>GTK+</application> library</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/libgnomeui-2.0, - lib/{gtk-2.0/2.4.0/filesystems, libgnomeui}, and + lib/{gtk-2.0/2.4.0/filesystems, libgnomeui} and share/gtk-doc/html/libgnomeui</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/libgtop.xml b/gnome/core/libgtop.xml index 4e28b9654c..2f05cd747d 100644 --- a/gnome/core/libgtop.xml +++ b/gnome/core/libgtop.xml @@ -104,6 +104,9 @@ install -v -m755 examples/.libs/* \ <sect2 role="commands"> <title>Command Explanations</title> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-prefix.xml"/> + <para><parameter>--infodir=$(pkg-config --variable=prefix ORBit-2.0)/share/info</parameter>: This switch installs the info documentation in @@ -135,7 +138,8 @@ install -v -m755 examples/.libs/* \ <envar>INFOPATH</envar> environment variable by adding the following to your system-wide or personal profile:</para> -<screen><literal>export INFOPATH=/usr/share/info:$GNOME_PREFIX/share/info</literal></screen> +<screen><literal>export INFOPATH=/usr/share/info:$(pkg-config \ + --variable=prefix ORBit-2.0)/share/info</literal></screen> </sect3> @@ -152,7 +156,7 @@ install -v -m755 examples/.libs/* \ <seglistitem> <seg>file_by_inode2 and mkinodedb2</seg> <seg>libgtop-2.0.{so,a}</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/libgtop-2.0 and lib/libgtop/examples</seg> </seglistitem> diff --git a/gnome/core/nautilus.xml b/gnome/core/nautilus.xml index 3e4931efe9..d65b3d51ba 100644 --- a/gnome/core/nautilus.xml +++ b/gnome/core/nautilus.xml @@ -103,9 +103,11 @@ install -v -m644 docs/*.{txt,dia,pdf,sxw,faq,html} $(pkg-config \ <sect2 role="commands"> <title>Command Explanations</title> - <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="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-sysconfdir.xml"/> </sect2> @@ -114,14 +116,14 @@ install -v -m644 docs/*.{txt,dia,pdf,sxw,faq,html} $(pkg-config \ <segmentedlist> <segtitle>Installed Programs</segtitle> - <segtitle>Installed Libraries</segtitle> + <segtitle>Installed Library</segtitle> <segtitle>Installed Directories</segtitle> <seglistitem> - <seg>nautilus, nautilus-connect-server, and + <seg>nautilus, nautilus-connect-server and nautilus-file-management-properties</seg> <seg>libnautilus-extension.so</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/nautilus, share/{doc/nautilus-&nautilus-version;, {,pixmaps}nautilus}</seg> </seglistitem> diff --git a/gnome/core/orbit2.xml b/gnome/core/orbit2.xml index a0dd709802..21593d15e5 100644 --- a/gnome/core/orbit2.xml +++ b/gnome/core/orbit2.xml @@ -94,16 +94,14 @@ make</userinput></screen> <para><parameter>--prefix=$GNOME_PREFIX</parameter>: This is the base installation for <application>GNOME-2</application> from which all future package installations will receive their prefix parameter. Be sure that - <envar>GNOME_PREFIX</envar> is set for this install or globally to your + <envar>$GNOME_PREFIX</envar> is set for this install or globally to your install directory as described in the introduction of this Chapter.</para> - <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="../gnome-sysconfdir.xml"/> - <para><option>--enable-gtk-doc</option>: Use this parameter if you have - <application>GTK-Doc</application> installed and you wish to build the - documentation.</para> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> </sect2> @@ -120,9 +118,9 @@ make</userinput></screen> orbit2-config and typelib-dump</seg> <seg>libname-server-2.a, libORBit-2.{so,a}, libORBit-imodule-2.{so,a}, libORBitCosNaming-2.{so,a}, and Everything_module.{so,a}</seg> - <seg>The following subdirectories of $GNOME_PREFIX/: + <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/: include/orbit-2.0, - lib/orbit-2.0, and + lib/orbit-2.0 and share/{gtk-doc/html/ORBit2, idl/orbit-2.0}</seg> </seglistitem> </segmentedlist> diff --git a/gnome/core/vte.xml b/gnome/core/vte.xml index 3da955d218..870834e1dc 100644 --- a/gnome/core/vte.xml +++ b/gnome/core/vte.xml @@ -121,8 +121,9 @@ make</userinput></screen> <command>ssfe</command> program. This issue is also caused by passing the additional parameters to the <command>configure</command> script.</para> - <para><parameter>--libexecdir=/usr/lib/vte</parameter>: This switch puts - libexec files in <filename class="directory">/usr/lib/vte</filename> + <para><parameter>--libexecdir=/usr/lib/vte</parameter>: This parameter + causes the libexec files to be installed in the preferred location of + <filename class="directory">/usr/lib/vte</filename> instead of <filename class="directory">/usr/libexec</filename>.</para> <para><option>--with-xft2 --with-pangox --with-glX</option>: These @@ -130,12 +131,8 @@ make</userinput></screen> to enable additional drawing methods in the <application>VTE</application> library.</para> - <!-- Disabling as the docs are not built by default in this release and - the tarball contains current docs - <para><parameter>-disable-gtk-doc</parameter>: This switch prevents the - building of documentation. Remove it if you have - <application>GTK-Doc</application> installed and wish to rebuild the - documentation.</para> --> + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/gtk-doc-rebuild.xml"/> </sect2> @@ -143,7 +140,7 @@ make</userinput></screen> <title>Contents</title> <segmentedlist> - <segtitle>Installed Programs</segtitle> + <segtitle>Installed Program</segtitle> <segtitle>Installed Libraries</segtitle> <segtitle>Installed Directories</segtitle> diff --git a/gnome/core/yelp.xml b/gnome/core/yelp.xml index d269ca7461..2ed72306b0 100644 --- a/gnome/core/yelp.xml +++ b/gnome/core/yelp.xml @@ -94,8 +94,8 @@ commands:</para> <screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \ - --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> @@ -109,10 +109,14 @@ make</userinput></screen> <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="../gnome-prefix.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../gnome-sysconfdir.xml"/> + + <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" + href="../../xincludes/scrollkeeper-dir.xml"/> </sect2> @@ -122,12 +126,12 @@ make</userinput></screen> <segmentedlist> <segtitle>Installed Programs</segtitle> <segtitle>Installed Libraries</segtitle> - <segtitle>Installed Directories</segtitle> + <segtitle>Installed Directory</segtitle> <seglistitem> <seg>gnome-help and yelp</seg> <seg>None</seg> - <seg>$GNOME_PREFIX/share/yelp</seg> + <seg><envar>$GNOME_PREFIX</envar>/share/yelp</seg> </seglistitem> </segmentedlist> |