Changeset 551b9389


Ignore:
Timestamp:
06/25/2006 07:48:15 PM (15 years ago)
Author:
Randy McMurchy <randy@…>
Branches:
10.0, 10.1, 11.0, 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, krejzi/svn, lazarus, nosym, perl-modules, qt5new, systemd-11177, systemd-13485, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
ebabf24
Parents:
7539d8f7
Message:

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

Files:
28 edited

Legend:

Unmodified
Added
Removed
  • gnome/core/control-center.xml

    r7539d8f7 r551b9389  
    8989
    9090<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
     91            --sysconfdir=&gnome-etc-dir; \
    9192            --localstatedir=/var/lib \
    92             --sysconfdir=&gnome-etc-dir; \
    9393            --libexecdir=$(pkg-config \
    9494                --variable=prefix ORBit-2.0)/lib/control-center &amp;&amp;
     
    106106    <title>Command Explanations</title>
    107107
     108    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     109    href="../gnome-prefix.xml"/>
     110
     111    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     112    href="../gnome-sysconfdir.xml"/>
     113
     114    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     115    href="../../xincludes/scrollkeeper-dir.xml"/>
     116
    108117    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
    109     ORBit-2.0)/lib/control-center</parameter>: This switch puts libexec files in
     118    ORBit-2.0)/lib/control-center</parameter>: This parameter causes the libexec
     119    files to be installed in the preferred location of
    110120    <filename class="directory">$GNOME_PREFIX/lib/control-center</filename>
    111121    instead of
    112122    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
    113 
    114     <para><parameter>--localstatedir=/var/lib</parameter>: This switch
    115     puts <application>scrollkeeper</application> files in
    116     <filename class="directory">/var/lib/scrollkeeper</filename> instead of
    117     <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
    118 
    119     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    120     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    121     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
    122123
    123124    <para><option>--enable-aboutme</option>: Enables building the
     
    149150        modules and <application>Nautilus</application> library module
    150151        extensions</seg>
    151         <seg>The following subdirectories of $GNOME_PREFIX/:
     152        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    152153        include/gnome-window-settings-2.0,
    153154        lib/{control-center, nautilus, window-manager-settings},
  • gnome/core/eel.xml

    r7539d8f7 r551b9389  
    8888  </sect2>
    8989
     90  <sect2 role="commands">
     91    <title>Command Explanations</title>
     92
     93    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     94    href="../gnome-prefix.xml"/>
     95
     96  </sect2>
     97
    9098  <sect2 role="content">
    9199    <title>Contents</title>
     
    99107        <seg>None</seg>
    100108        <seg>libeel-2.{so,a}</seg>
    101         <seg>$GNOME_PREFIX/include/eel-2</seg>
     109        <seg><envar>$GNOME_PREFIX</envar>/include/eel-2</seg>
    102110      </seglistitem>
    103111    </segmentedlist>
  • gnome/core/gail.xml

    r7539d8f7 r551b9389  
    100100  </sect2>
    101101
    102   <!-- <sect2 role="commands">
     102  <sect2 role="commands">
    103103    <title>Command Explanations</title>
    104104
    105     <para><option>-enable-gtk-doc</option>: Use this parameter if you have
    106     <application>GTK-Doc</application> installed and wish to build the API
    107     documentation as the source tarball doesn't contain pre-built docs.</para>
     105    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     106    href="../gnome-prefix.xml"/>
    108107
    109   </sect2> -->
     108    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     109    href="../../xincludes/gtk-doc-rebuild.xml"/>
     110
     111  </sect2>
    110112
    111113  <sect2 role="content">
     
    121123        <seg>libgailutil.so and <application>GAIL</application>
    122124        <application>GTK+</application> modules</seg>
    123         <seg>The following subdirectories of $GNOME_PREFIX/:
     125        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    124126        include/gail-1.0,
    125         lib/gtk-2.0/modules, and
     127        lib/gtk-2.0/modules and
    126128        share/gtk-doc/html/gail-libgail-util</seg>
    127129      </seglistitem>
  • gnome/core/gconf.xml

    r7539d8f7 r551b9389  
    9898    <title>Command Explanations</title>
    9999
     100    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     101    href="../gnome-prefix.xml"/>
     102
     103    <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This parameter
     104    causes the <application>GConf-2</application> configuration database to be
     105    built in <filename class="directory">&gnome-etc-dir;</filename> instead of
     106    <filename class="directory">$GNOME_PREFIX/etc</filename>. This installation
     107    controls all future installations of <application>GConf-2</application>
     108    schemas. If you change the location (which includes eliminating this
     109    parameter), it <emphasis role='strong'>must</emphasis> be consistent for
     110    every subsequent package installation that updates the
     111    <application>GConf-2</application> configuration database.</para>
     112
    100113    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
    101     ORBit-2.0)/lib/GConf</parameter>: This switch puts libexec files in
     114    ORBit-2.0)/lib/GConf</parameter>: This parameter causes the libexec files
     115    to be installed in the preferred location of
    102116    <filename class="directory">$GNOME_PREFIX/lib/GConf</filename> instead of
    103117    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
    104118
    105     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch
    106     puts <application>GConf-2</application> configuration files
    107     in <filename class="directory">&gnome-etc-dir;</filename> instead of
    108     <filename class="directory">$GNOME_PREFIX/etc</filename>.  This
    109     installation controls all future installations of schemas. If you
    110     change the location (which includes eliminating this parameter), it
    111     <emphasis>must</emphasis> be consistent for every subsequent
    112     package installation that updates the <application>GConf-2</application>
    113     configuration database.</para>
     119    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     120    href="../gnome-mandir.xml"/>
     121
     122    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     123    href="../../xincludes/gtk-doc-rebuild.xml"/>
    114124
    115125  </sect2>
     
    127137        <seg>libgconf-2.{so,a}</seg>
    128138        <seg>&gnome-etc-dir;/gconf and the following subdirectories of
    129         $GNOME_PREFIX/:
     139        <envar>$GNOME_PREFIX</envar>/:
    130140        include/gconf,
    131         lib/GConf, and
     141        lib/GConf and
    132142        share/{GConf, gtk-doc/html/gconf, sgml/gconf}</seg>
    133143      </seglistitem>
  • gnome/core/gnome-applets.xml

    r7539d8f7 r551b9389  
    7070    <xref linkend="system-tools-backends"/>,
    7171    <xref linkend="docbook-utils"/>,
    72     <ulink
    73     url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink>,
    74     and <ulink
    75     url="http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.2.2.tar.gz">
    76     libnotify-0.2.2</ulink></para>
     72    <ulink url="http://club.pep.ne.jp/~ishioka/Software/Linux/libapm-e.html">libapm</ulink>, and
     73    <ulink url="http://www.galago-project.org/news/index.php">libnotify</ulink></para>
    7774
    7875    <para condition="html" role="usernotes">User Notes:
     
    8885
    8986<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
     87            --sysconfdir=&gnome-etc-dir; \
    9088            --localstatedir=/var/lib \
    91             --sysconfdir=&gnome-etc-dir; \
    9289            --libexecdir=$(pkg-config \
    9390                --variable=prefix ORBit-2.0)/lib/gnome-applets \
     
    108105    <title>Command Explanations</title>
    109106
     107    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     108    href="../gnome-prefix.xml"/>
     109
     110    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     111    href="../gnome-sysconfdir.xml"/>
     112
     113    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     114    href="../../xincludes/scrollkeeper-dir.xml"/>
     115
    110116    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
    111     ORBit-2.0)/lib/gnome-applets</parameter>: This switch puts libexec files
     117    ORBit-2.0)/lib/gnome-applets</parameter>: This parameter causes the libexec
     118    files to be installed in the preferred location of
    112119    in <filename class="directory">$GNOME_PREFIX/lib/gnome-applets</filename>
    113120    instead of
    114121    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
    115122
    116     <para><parameter>--localstatedir=/var/lib</parameter>: This switch
    117     puts <application>ScrollKeeper</application> files in
    118     <filename class="directory">/var/lib/scrollkeeper</filename> instead of
    119     <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
     123    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     124    href="../gnome-mandir.xml"/>
    120125
    121     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    122     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    123     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
    124 
    125     <para><command>make -C man install-man</command>: This installs the man-pages
    126     that are not installed during <command>make install</command>.</para>
     126    <para><command>make -C man install-man</command>: This command installs
     127    the man-pages that are not installed during
     128    <command>make install</command>.</para>
    127129
    128130  </sect2>
     
    139141        <seg>cpufreq-selector and gswitchit-plugins-capplet</seg>
    140142        <seg>None</seg>
    141         <seg>&gnome-etc-dir;/gconf/gconf.xml.defaults/{,schemas}apps/{too
    142         many to list} and the following subdirectories of $GNOME_PREFIX/:
    143         include/libgswitchit,
     143        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
     144        include/libg{switchit,weather},
    144145        lib/gnome-applets,
    145146        share/{gnome-applets, {gnome/help,omf}/{too many to list},
    146         pixmaps/{accessx-status-applet, cpufreq-applet, stickynotes}, and
     147        pixmaps/{accessx-status-applet, cpufreq-applet, stickynotes},
    147148        xmodmap}</seg>
    148149      </seglistitem>
  • gnome/core/gnome-backgrounds.xml

    r7539d8f7 r551b9389  
    3131
    3232    <para>The <application>gnome-backgrounds</application> package contains
    33     a set of backgrounds used in the <application>GNOME</application>
    34     desktop.</para>
     33    a collection of graphics files which can be used as backgrounds in the
     34    GNOME desktop environment. Additionally, the package creates the proper
     35    framework and directory structure so that you can add your own files to
     36    the collection.</para>
    3537
    3638    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    8991  </sect2>
    9092
     93  <sect2 role="commands">
     94    <title>Command Explanations</title>
     95
     96    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     97    href="../gnome-prefix.xml"/>
     98
     99  </sect2>
     100
    91101  <sect2 role="content">
    92102    <title>Contents</title>
     
    100110        <seg>None</seg>
    101111        <seg>None</seg>
    102         <seg>$GNOME_PREFIX/share/{gnome-background-properties,
     112        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome-background-properties,
    103113        pixmaps/backgrounds}</seg>
    104114      </seglistitem>
  • gnome/core/gnome-desktop.xml

    r7539d8f7 r551b9389  
    9595    <title>Command Explanations</title>
    9696
    97     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    98     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    99     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     97    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     98    href="../gnome-prefix.xml"/>
     99
     100    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     101    href="../gnome-sysconfdir.xml"/>
     102
     103    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     104    href="../../xincludes/scrollkeeper-dir.xml"/>
    100105
    101106    <para><option>--with-gnome-distributor="Some Name"</option>: Use this
     
    106111    parameter if <application>KDE</application> is installed in any prefix
    107112    other than <filename class='directory'>/usr</filename>.</para>
     113
     114    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     115    href="../gnome-mandir.xml"/>
     116
     117    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     118    href="../../xincludes/gtk-doc-rebuild.xml"/>
    108119
    109120  </sect2>
     
    120131        <seg>gnome-about</seg>
    121132        <seg>libgnome-desktop-2.{so,a}</seg>
    122         <seg>The following subdirectories of $GNOME_PREFIX/:
     133        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    123134        include/gnome-desktop-2.0,
    124135        share/{gnome-about,
  • gnome/core/gnome-doc-utils.xml

    r7539d8f7 r551b9389  
    6969    <xref linkend="scrollkeeper"/></para>
    7070
    71     <para>The packages are listed as recommended because if they are not
    72     installed (and the proper switches are passed to the
    73     <command>configure</command> command), functionality will be missing that
    74     is expected later in other GNOME packages.</para>
     71    <para>The packages are listed as recommended even though
     72    <application>GNOME Doc Utils</application> will build fine without them.
     73    If you don't install the recommended packages (and you pass the appropriate
     74    flags to the <command>configure</command> command so that it will build
     75    without them), functionality will be missing that is expected later in
     76    other GNOME packages.</para>
    7577
    7678    <bridgehead renderas="sect4">Optional</bridgehead>
     
    104106  </sect2>
    105107
     108  <sect2 role="commands">
     109    <title>Command Explanations</title>
     110
     111    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     112    href="../gnome-prefix.xml"/>
     113
     114    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     115    href="../gnome-mandir.xml"/>
     116
     117  </sect2>
     118
    106119  <sect2 role="content">
    107120    <title>Contents</title>
     
    116129        <seg>gnome-doc-prepare and xml2po</seg>
    117130        <seg>None</seg>
    118         <seg>The following subdirectories of $GNOME_PREFIX/share/:
     131        <seg>The following subdirectories of
     132        <envar>$GNOME_PREFIX</envar>/share/:
    119133        gnome-doc-utils,
    120134        gnome/help/gnome-doc-{make,xslt},
  • gnome/core/gnome-keyring.xml

    r7539d8f7 r551b9389  
    9494    <title>Command Explanations</title>
    9595
     96    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     97    href="../gnome-prefix.xml"/>
     98
    9699    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
    97     ORBit-2.0)/lib/gnome-keyring</parameter>: This switch puts libexec files in
     100    ORBit-2.0)/lib/gnome-keyring</parameter>: This parameter causes the libexec
     101    files to be installed in the preferred location of
    98102    <filename class="directory">$GNOME_PREFIX/lib/gnome-keyring</filename>
    99103    instead of
     
    106110
    107111    <segmentedlist>
    108       <segtitle>Installed Programs</segtitle>
     112      <segtitle>Installed Program</segtitle>
    109113      <segtitle>Installed Library</segtitle>
    110       <segtitle>Installed Directory</segtitle>
     114      <segtitle>Installed Directories</segtitle>
    111115
    112116      <seglistitem>
    113117        <seg>gnome-keyring-daemon</seg>
    114118        <seg>libgnome-keyring.so</seg>
    115         <seg>The following subdirectories of $GNOME_PREFIX/:
     119        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    116120        include/gnome-keyring-1,
    117121        lib/gnome-keyring and
  • gnome/core/gnome-menus.xml

    r7539d8f7 r551b9389  
    9595<screen role="root"><userinput>make install</userinput></screen>
    9696
    97     <para>If your <application>GNOME</application>-2 installation prefix is
    98     anything other than <filename class='directory'>/usr</filename> and you
    99     have <application>Python</application> installed, create some symbolic
    100     links as the <systemitem class="username">root</systemitem> user:</para>
    101 
    102 <screen role="root"><userinput>ln -v -s $(pkg-config --variable=prefix \
    103              ORBit-2.0)/lib/python2.4/site-packages/GMenuSimpleEditor \
    104          /usr/lib/python2.4/site-packages &amp;&amp;
    105 ln -v -s $(pkg-config --variable=prefix \
    106              ORBit-2.0)/lib/python2.4/site-packages/gmenu.* \
    107          /usr/lib/python2.4/site-packages</userinput></screen>
     97  </sect2>
     98
     99  <sect2 role="commands">
     100    <title>Command Explanations</title>
     101
     102    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     103    href="../gnome-prefix.xml"/>
     104
     105    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     106    href="../gnome-sysconfdir.xml"/>
    108107
    109108  </sect2>
     
    115114      <title>Configuration Information</title>
    116115
    117       <para>So that <application>GNOME</application> can find the desktop
    118       configuration files, ensure you set the <envar>XDG_CONFIG_DIRS</envar>
    119       environment variable in the system profile, or in individual user's
    120       profiles as shown below (you may add additional directories, separated
    121       with colons, if desired):</para>
     116      <sect4>
     117        <title>XDG_CONFIG_DIRS Variable</title>
     118
     119        <para>So that <application>GNOME</application> can find the desktop
     120        configuration files, ensure you set the <envar>XDG_CONFIG_DIRS</envar>
     121        environment variable in the system profile, or in individual user's
     122        profiles as shown below (you may add additional directories, separated
     123        with colons, if desired):</para>
    122124
    123125<screen><literal>export XDG_CONFIG_DIRS=/usr/share:&gnome-etc-dir;/xdg</literal></screen>
     126
     127      </sect4>
     128
     129      <sect4>
     130        <title>PYTHONPATH Variable</title>
     131
     132        <para>If your GNOME-2 installation prefix is anything other than
     133        <filename class='directory'>/usr</filename> and you have
     134        <application>Python</application> installed, you need to update the
     135        <envar>PYTHONPATH</envar> environment variable so that the
     136        <filename>gmenu</filename> module can be located by
     137        <application>Python</application>. Set the variable in the system
     138        profile, or in individual user's profiles as shown below:</para>
     139
     140<screen><literal>export PYTHONPATH=$PYTHONPATH:$(pkg-config --variable=prefix \
     141       ORBit-2.0)/lib/python2.4/site-packages:$(pkg-config \
     142       --variable=prefix \
     143       ORBit-2.0)/lib/python2.4/site-packages/GMenuSimpleEditor</literal></screen>
     144
     145      </sect4>
    124146
    125147    </sect3>
     
    131153
    132154    <segmentedlist>
    133       <segtitle>Installed Program</segtitle>
     155      <segtitle>Installed Programs</segtitle>
    134156      <segtitle>Installed Library</segtitle>
    135157      <segtitle>Installed Directories</segtitle>
     
    139161        <seg>libgnome-menu.{so,a}</seg>
    140162        <seg>&gnome-etc-dir;/xdg and the following subdirectories of
    141         $GNOME_PREFIX/:
     163        <envar>$GNOME_PREFIX</envar>/:
    142164        include/gnome-menus,
    143165        lib/python2.4/site-packages/GMenuSimpleEditor,
  • gnome/core/gnome-mime-data.xml

    r7539d8f7 r551b9389  
    9595    <title>Command Explanations</title>
    9696
    97     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    98     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    99     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     97    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     98    href="../gnome-prefix.xml"/>
     99   
     100    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     101    href="../gnome-sysconfdir.xml"/>
    100102
    101     <para><parameter>--mandir=...</parameter>: This switch is unneeded and may
    102     be removed as the man page is installed manually. It is only in the
    103     instructions in case the man page is ever installed during
    104     <command>make install</command>.</para>
     103    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     104    href="../gnome-mandir.xml"/>
    105105
    106106  </sect2>
     
    117117        <seg>None</seg>
    118118        <seg>None</seg>
    119         <seg>$GNOME_PREFIX/share/{application-registry, share/mime-info}</seg>
     119        <seg><envar>$GNOME_PREFIX</envar>/share/{application-registry,
     120        share/mime-info}</seg>
    120121      </seglistitem>
    121122    </segmentedlist>
  • gnome/core/gnome-panel.xml

    r7539d8f7 r551b9389  
    8181
    8282<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
     83            --sysconfdir=&gnome-etc-dir; \
    8384            --localstatedir=/var/lib \
    84             --sysconfdir=&gnome-etc-dir; \
    8585            --libexecdir=$(pkg-config \
    8686                --variable=prefix ORBit-2.0)/lib/gnome-panel \
     
    100100    <title>Command Explanations</title>
    101101
     102    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     103    href="../gnome-prefix.xml"/>
     104
     105    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     106    href="../gnome-sysconfdir.xml"/>
     107
     108    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     109    href="../../xincludes/scrollkeeper-dir.xml"/>
     110
    102111    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
    103     ORBit-2.0)/lib/gnome-panel</parameter>: This switch puts libexec files in
     112    ORBit-2.0)/lib/gnome-panel</parameter>: This parameter causes the libexec
     113    files to be installed in the preferred location of
    104114    <filename class="directory">$GNOME_PREFIX/lib/gnome-panel</filename>
    105115    instead of
    106116    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
    107117
    108     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    109     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    110     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     118    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     119    href="../gnome-mandir.xml"/>
     120   
     121    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     122    href="../../xincludes/gtk-doc-rebuild.xml"/>
    111123
    112124  </sect2>
     
    117129    <segmentedlist>
    118130      <segtitle>Installed Programs</segtitle>
    119       <segtitle>Installed Libraries</segtitle>
     131      <segtitle>Installed Library</segtitle>
    120132      <segtitle>Installed Directories</segtitle>
    121133
     
    123135        <seg>gnome-desktop-item-edit, gnome-panel and panel-test-applets</seg>
    124136        <seg>libpanel-applet-2.{so,a}</seg>
    125         <seg>The following subdirectories of $GNOME_PREFIX/:
     137        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    126138        include/panel-2.0,
    127139        lib/gnome-panel,
  • gnome/core/gnome-session.xml

    r7539d8f7 r551b9389  
    9393    <title>Command Explanations</title>
    9494
    95     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    96     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    97     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     95    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     96    href="../gnome-prefix.xml"/>
     97
     98    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     99    href="../gnome-sysconfdir.xml"/>
     100
     101    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     102    href="../gnome-mandir.xml"/>
    98103
    99104  </sect2>
     
    105110      <segtitle>Installed Programs</segtitle>
    106111      <segtitle>Installed Libraries</segtitle>
    107       <segtitle>Installed Directories</segtitle>
     112      <segtitle>Installed Directory</segtitle>
    108113
    109114      <seglistitem>
     
    111116        gnome-session-save, and gnome-wm</seg>
    112117        <seg>None</seg>
    113         <seg>$GNOME_PREFIX/share/pixmaps/splash</seg>
     118        <seg><envar>$GNOME_PREFIX</envar>/share/pixmaps/splash</seg>
    114119      </seglistitem>
    115120    </segmentedlist>
  • gnome/core/gnome-terminal.xml

    r7539d8f7 r551b9389  
    7575
    7676<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
    77             --localstatedir=/var/lib \
    78             --sysconfdir=&gnome-etc-dir; &amp;&amp;
     77            --sysconfdir=&gnome-etc-dir; \
     78            --localstatedir=/var/lib &amp;&amp;
    7979make</userinput></screen>
    8080
     
    9090    <title>Command Explanations</title>
    9191
    92     <para><parameter>--localstatedir=/var/lib</parameter>: This switch puts
    93     <application>ScrollKeeper</application> files in
    94     <filename class="directory">/var/lib/scrollkeeper</filename> instead of
    95     <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
     92    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     93    href="../gnome-prefix.xml"/>
    9694
    97     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    98     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    99     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     95    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     96    href="../gnome-sysconfdir.xml"/>
     97
     98    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     99    href="../../xincludes/scrollkeeper-dir.xml"/>
    100100
    101101  </sect2>
     
    112112        <seg>gnome-terminal</seg>
    113113        <seg>None</seg>
    114         <seg>$GNOME_PREFIX/share/{,gnome/help/,omf/}gnome-terminal</seg>
     114        <seg><envar>$GNOME_PREFIX</envar>/share/{,gnome/help/,omf/}gnome-terminal</seg>
    115115      </seglistitem>
    116116    </segmentedlist>
  • gnome/core/gnome-user-docs.xml

    r7539d8f7 r551b9389  
    9191    <title>Command Explanations</title>
    9292
    93     <para><parameter>--localstatedir=/var/lib</parameter>: This switch
    94     puts <application>ScrollKeeper</application> files in
    95     <filename class="directory">/var/lib/scrollkeeper</filename> instead of
    96     <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
     93    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     94    href="../gnome-prefix.xml"/>
     95
     96    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     97    href="../../xincludes/scrollkeeper-dir.xml"/>
    9798
    9899  </sect2>
     
    109110        <seg>None</seg>
    110111        <seg>None</seg>
    111         <seg>$GNOME_PREFIX/share/{gnome/help/{gnome-access-guide,system-admin-guide,user-guide},
     112        <seg><envar>$GNOME_PREFIX</envar>/share/{gnome/help/{gnome-access-guide,
     113        system-admin-guide, user-guide},
    112114        omf/{gnome-user-docs,user-guide}}</seg>
    113115      </seglistitem>
  • gnome/core/gnome-vfs.xml

    r7539d8f7 r551b9389  
    8282
    8383    <para>If you run <command>./configure --help</command> for the complete
    84     list of dependency requirements and available switches, you may notice a
     84    list of dependency requirements and available parameters, you may notice a
    8585    message about the <xref linkend="gnome-mount"/> package. This package is
    8686    not required at build-time, and is only a run-time dependency. If
    8787    <application>gnome-mount</application> is available at run-time,
    88     <application>GNOME-VFS</application> will use it. If not available,
     88    <application>GNOME-VFS</application> will use it. If it is not available,
    8989    <application>GNOME-VFS</application> will fall back to using other mounting
    9090    mechanisms.</para>
     
    118118    <title>Command Explanations</title>
    119119
    120     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    121     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    122     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     120    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     121    href="../gnome-prefix.xml"/>
     122
     123    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     124    href="../gnome-sysconfdir.xml"/>
    123125
    124126    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
    125     ORBit-2.0)/lib/gnome-vfs-2.0</parameter>: This switch puts libexec files in
     127    ORBit-2.0)/lib/gnome-vfs-2.0</parameter>: This parameter causes the libexec
     128    files to be installed in the preferred location of
    126129    <filename class="directory">$GNOME_PREFIX/lib/gnome-vfs-2.0</filename>
    127130    instead of
    128131    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
    129 
    130     <!-- Apparently fixed
    131     <para><command>rmdir $(pkg-config -variable=prefix ORBit-2.0)/doc</command>:
    132     Use this command if <envar>$GNOME_PREFIX</envar> is anything other than
    133     <filename class='directory'>/usr</filename> as the directory is unneeded and
    134     unpopulated.</para> -->
    135132
    136133    <para><option>--with-hal-eject=PROGRAM</option>: This parameter does not
     
    138135    url="http://ca.geocities.com/jefftranter@rogers.com/eject.html">Eject</ulink>
    139136    or <xref linkend="gnome-mount"/> installed, as the <command>eject</command>
    140     program is used if gnome-mount is not installed.</para>
     137    program is used if <application>gnome-mount</application> is not
     138    installed.</para>
    141139
    142     <!-- Commenting this out for now as the documentation is already built
    143          and installed by default
    144     <para><option>-enable-gtk-doc</option>: Use this option if you have
    145     <application>GTK-Doc</application> installed and wish to build the API
    146     documentation.</para> -->
     140    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     141    href="../../xincludes/gtk-doc-rebuild.xml"/>
    147142
    148143  </sect2>
     
    162157        <seg>The following subdirectories of &gnome-etc-dir;/:
    163158        gconf/{schemas, gconf.xml.defaults/{desktop, schemas, system},
    164         gnome-vfs-2.0} and the following subdirectories of $GNOME_PREFIX/:
     159        gnome-vfs-2.0} and the following subdirectories of
     160        <envar>$GNOME_PREFIX</envar>/:
    165161        include/gnome-vfs-{,module-}2.0,
    166162        lib/gnome-vfs{,-2.0},
  • gnome/core/gtk-engines.xml

    r7539d8f7 r551b9389  
    9595        <seg>None</seg>
    9696        <seg><application>GTK-2</application> engines libraries</seg>
    97         <seg>/usr/lib/gtk-2.0/engines and /usr/share/themes/{theme name}</seg>
     97        <seg>/usr/lib/gtk-2.0/engines and /usr/share/themes/{theme names}</seg>
    9898        <seg>Clearlooks, Crux, Industrial, LighthouseBlue, Metal, Mist,
    9999        Redmond and ThinIce</seg>
  • gnome/core/libbonobo.xml

    r7539d8f7 r551b9389  
    9898    <title>Command Explanations</title>
    9999
    100     <para><parameter>--prefix=$(pkg-config --variable=prefix
    101     ORBit-2.0)</parameter>: Setting the prefix with this command instead of
    102     with <envar>GNOME_PREFIX</envar> will ensure that the prefix is
    103     consistent with the installation environment.</para>
     100    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     101    href="../gnome-prefix.xml"/>
     102
     103    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     104    href="../gnome-sysconfdir.xml"/>
    104105
    105106    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
    106     ORBit-2.0)/lib/bonobo</parameter>: This switch puts libexec files in
     107    ORBit-2.0)/lib/bonobo</parameter>: This parameter causes the libexec
     108    files to be installed in the preferred location of
    107109    <filename class="directory">$GNOME_PREFIX/lib/bonobo</filename> instead of
    108110    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
    109111
    110     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    111     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    112     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     112    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     113    href="../gnome-mandir.xml"/>
    113114
    114     <para><option>--enable-gtk-doc</option>: This switch rebuilds the
    115     documentation during the <command>make</command> command.</para>
     115    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     116    href="../../xincludes/gtk-doc-rebuild.xml"/>
    116117
    117118  </sect2>
     
    133134        servers, and libmoniker_std_2.{so,a} bonobo library</seg>
    134135        <seg>&gnome-etc-dir;/bonobo-activation and the following subdirectories
    135         of $GNOME_PREFIX/:
     136        of <envar>$GNOME_PREFIX</envar>/:
    136137        include/{bonobo-activation-2.0,libbonobo-2.0},
    137138        lib/{bonobo{,-2.0},libbonobo}, and
  • gnome/core/libbonoboui.xml

    r7539d8f7 r551b9389  
    8585install -v -m755 -d $(pkg-config \
    8686        --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version; &amp;&amp;
    87 install -v -m644 doc/*.{dtd,txt,xml,html} \
    88         $(pkg-config \
    89             --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version;</userinput></screen>
     87install -v -m644 doc/*.{dtd,txt,xml,html} $(pkg-config \
     88        --variable=prefix ORBit-2.0)/share/doc/libbonoboui-&libbonoboui-version;</userinput></screen>
     89
     90  </sect2>
     91
     92  <sect2 role="commands">
     93    <title>Command Explanations</title>
     94   
     95    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     96    href="../gnome-prefix.xml"/>
     97   
     98    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     99    href="../../xincludes/gtk-doc-rebuild.xml"/>
    90100
    91101  </sect2>
     
    102112        <seg>bonobo-browser and test-moniker</seg>
    103113        <seg>libbonoboui-2.{so,a} and libbonobo.{so,a} Glade library</seg>
    104         <seg>The following subdirectories of $GNOME_PREFIX/:
    105         include/libbonoboui-2.0 and
     114        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
     115        include/libbonoboui-2.0,
    106116        share/{doc/libbonoboui-&libbonoboui-version;,
    107117        gnome-2.0, gtk-doc/html/libbonoboui}</seg>
  • gnome/core/libgnome.xml

    r7539d8f7 r551b9389  
    9494    <title>Command Explanations</title>
    9595
    96     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    97     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    98     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     96    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     97    href="../gnome-prefix.xml"/>
     98   
     99    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     100    href="../gnome-sysconfdir.xml"/>
    99101
    100102    <para><parameter>--localstatedir=/var/lib</parameter>: This
    101     switch sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to
     103    parameter sets <envar>LIBGNOME_LOCALSTATEDIR</envar> to
    102104    <filename class='directory'>/var/lib</filename> instead
    103105    of <filename class='directory'>$GNOME_PREFIX/var</filename>
     
    105107    installation and properly record high scores in
    106108    <filename class='directory'>/var/lib/games</filename>.</para>
     109
     110    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     111    href="../gnome-mandir.xml"/>
     112
     113    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     114    href="../../xincludes/gtk-doc-rebuild.xml"/>
    107115
    108116  </sect2>
     
    121129        library</seg>
    122130        <seg>&gnome-etc-dir;/sound,
    123         and the following subdirectories of $GNOME_PREFIX/:
     131        and the following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    124132        include/libgnome-2.0, share/gtk-doc/html/libgnome</seg>
    125133      </seglistitem>
  • gnome/core/libgnomecanvas.xml

    r7539d8f7 r551b9389  
    9191  </sect2>
    9292
     93  <sect2 role="commands">
     94    <title>Command Explanations</title>
     95   
     96    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     97    href="../gnome-prefix.xml"/>
     98
     99    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     100    href="../../xincludes/gtk-doc-rebuild.xml"/>
     101
     102  </sect2>
     103
    93104  <sect2 role="content">
    94105    <title>Contents</title>
     
    103114        <seg>libgnomecanvas-2.{so,a} and the libcanvas.{so,a} Glade
    104115        library</seg>
    105         <seg>The following subdirectories of $GNOME_PREFIX/:
     116        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    106117        include/libgnomecanvas-2.0,
    107         lib/libglade, and
     118        lib/libglade and
    108119        share/gtk-doc/html/libgnomecanvas</seg>
    109120      </seglistitem>
  • gnome/core/libgnomeui.xml

    r7539d8f7 r551b9389  
    102102    <title>Command Explanations</title>
    103103
     104    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     105    href="../gnome-prefix.xml"/>
     106
    104107    <para><parameter>--libexecdir=$(pkg-config --variable=prefix
    105     ORBit-2.0)/lib/libgnomeui</parameter>: This switch puts libexec files in
     108    ORBit-2.0)/lib/libgnomeui</parameter>: This parameter causes the libexec
     109    files to be installed in the preferred location of
    106110    <filename class="directory">$GNOME_PREFIX/lib/libgnomeui</filename> instead
    107111    of <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
     
    110114    parameter if you have <application>KDE</application> installed in any prefix
    111115    other than <filename class='directory'>/usr</filename>.</para>
     116
     117    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     118    href="../../xincludes/gtk-doc-rebuild.xml"/>
    112119
    113120  </sect2>
     
    138145
    139146    <segmentedlist>
    140       <segtitle>Installed Program</segtitle>
     147      <segtitle>Installed Programs</segtitle>
    141148      <segtitle>Installed Libraries</segtitle>
    142149      <segtitle>Installed Directories</segtitle>
     
    146153        <seg>libgnomeui-2.{so,a}, the libgnome.{so,a} Glade library, and
    147154        the libgnome-vfs.{so,a} <application>GTK+</application> library</seg>
    148         <seg>The following subdirectories of $GNOME_PREFIX/:
     155        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    149156        include/libgnomeui-2.0,
    150         lib/{gtk-2.0/2.4.0/filesystems, libgnomeui}, and
     157        lib/{gtk-2.0/2.4.0/filesystems, libgnomeui} and
    151158        share/gtk-doc/html/libgnomeui</seg>
    152159      </seglistitem>
  • gnome/core/libgtop.xml

    r7539d8f7 r551b9389  
    105105    <title>Command Explanations</title>
    106106
     107    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     108    href="../gnome-prefix.xml"/>
     109
    107110    <para><parameter>--infodir=$(pkg-config --variable=prefix
    108111    ORBit-2.0)/share/info</parameter>:
     
    136139      to your system-wide or personal profile:</para>
    137140
    138 <screen><literal>export INFOPATH=/usr/share/info:$GNOME_PREFIX/share/info</literal></screen>
     141<screen><literal>export INFOPATH=/usr/share/info:$(pkg-config \
     142       --variable=prefix ORBit-2.0)/share/info</literal></screen>
    139143
    140144    </sect3>
     
    153157        <seg>file_by_inode2 and mkinodedb2</seg>
    154158        <seg>libgtop-2.0.{so,a}</seg>
    155         <seg>The following subdirectories of $GNOME_PREFIX/:
     159        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    156160        include/libgtop-2.0 and
    157161        lib/libgtop/examples</seg>
  • gnome/core/nautilus.xml

    r7539d8f7 r551b9389  
    104104    <title>Command Explanations</title>
    105105
    106     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    107     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    108     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     106    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     107    href="../gnome-prefix.xml"/>
     108
     109    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     110    href="../gnome-sysconfdir.xml"/>
    109111
    110112  </sect2>
     
    115117    <segmentedlist>
    116118      <segtitle>Installed Programs</segtitle>
    117       <segtitle>Installed Libraries</segtitle>
     119      <segtitle>Installed Library</segtitle>
    118120      <segtitle>Installed Directories</segtitle>
    119121
    120122      <seglistitem>
    121         <seg>nautilus, nautilus-connect-server, and
     123        <seg>nautilus, nautilus-connect-server and
    122124        nautilus-file-management-properties</seg>
    123125        <seg>libnautilus-extension.so</seg>
    124         <seg>The following subdirectories of $GNOME_PREFIX/:
     126        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    125127        include/nautilus,
    126128        share/{doc/nautilus-&nautilus-version;, {,pixmaps}nautilus}</seg>
  • gnome/core/orbit2.xml

    r7539d8f7 r551b9389  
    9595    installation for <application>GNOME-2</application> from which all future
    9696    package installations will receive their prefix parameter. Be sure that
    97     <envar>GNOME_PREFIX</envar> is set for this install or globally to your
     97    <envar>$GNOME_PREFIX</envar> is set for this install or globally to your
    9898    install directory as described in the introduction of this Chapter.</para>
    9999
    100     <para><parameter>--sysconfdir=&gnome-etc-dir;</parameter>: This switch puts
    101     configuration files in <filename class="directory">&gnome-etc-dir;</filename>
    102     instead of <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
     100    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     101    href="../gnome-sysconfdir.xml"/>
    103102
    104     <para><option>--enable-gtk-doc</option>: Use this parameter if you have
    105     <application>GTK-Doc</application> installed and you wish to build the
    106     documentation.</para>
     103    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     104    href="../../xincludes/gtk-doc-rebuild.xml"/>
    107105
    108106  </sect2>
     
    121119        <seg>libname-server-2.a, libORBit-2.{so,a}, libORBit-imodule-2.{so,a},
    122120        libORBitCosNaming-2.{so,a}, and Everything_module.{so,a}</seg>
    123         <seg>The following subdirectories of $GNOME_PREFIX/:
     121        <seg>The following subdirectories of <envar>$GNOME_PREFIX</envar>/:
    124122        include/orbit-2.0,
    125         lib/orbit-2.0, and
     123        lib/orbit-2.0 and
    126124        share/{gtk-doc/html/ORBit2, idl/orbit-2.0}</seg>
    127125      </seglistitem>
  • gnome/core/vte.xml

    r7539d8f7 r551b9389  
    122122    additional parameters to the <command>configure</command> script.</para>
    123123
    124     <para><parameter>--libexecdir=/usr/lib/vte</parameter>: This switch puts
    125     libexec files in <filename class="directory">/usr/lib/vte</filename>
     124    <para><parameter>--libexecdir=/usr/lib/vte</parameter>: This parameter
     125    causes the libexec files to be installed in the preferred location of
     126    <filename class="directory">/usr/lib/vte</filename>
    126127    instead of <filename class="directory">/usr/libexec</filename>.</para>
    127128
     
    131132    <application>VTE</application> library.</para>
    132133
    133     <!-- Disabling as the docs are not built by default in this release and
    134          the tarball contains current docs
    135     <para><parameter>-disable-gtk-doc</parameter>: This switch prevents the
    136     building of documentation. Remove it if you have
    137     <application>GTK-Doc</application> installed and wish to rebuild the
    138     documentation.</para> -->
     134    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     135    href="../../xincludes/gtk-doc-rebuild.xml"/>
    139136
    140137  </sect2>
     
    144141
    145142    <segmentedlist>
    146       <segtitle>Installed Programs</segtitle>
     143      <segtitle>Installed Program</segtitle>
    147144      <segtitle>Installed Libraries</segtitle>
    148145      <segtitle>Installed Directories</segtitle>
  • gnome/core/yelp.xml

    r7539d8f7 r551b9389  
    9595
    9696<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
    97             --localstatedir=/var/lib \
    98             --sysconfdir=&gnome-etc-dir; &amp;&amp;
     97            --sysconfdir=&gnome-etc-dir; \
     98            --localstatedir=/var/lib &amp;&amp;
    9999make</userinput></screen>
    100100
     
    110110    <title>Command Explanations</title>
    111111
    112     <para><parameter>--localstatedir=/var/lib</parameter>: This switch puts
    113     <application>ScrollKeeper</application> files in
    114     <filename class='directory'>/var/lib/scrollkeeper</filename> instead of
    115     <filename class='directory'>$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
     112    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     113    href="../gnome-prefix.xml"/>
     114
     115    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     116    href="../gnome-sysconfdir.xml"/>
     117
     118    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     119    href="../../xincludes/scrollkeeper-dir.xml"/>
    116120
    117121  </sect2>
     
    123127      <segtitle>Installed Programs</segtitle>
    124128      <segtitle>Installed Libraries</segtitle>
    125       <segtitle>Installed Directories</segtitle>
     129      <segtitle>Installed Directory</segtitle>
    126130
    127131      <seglistitem>
    128132        <seg>gnome-help and yelp</seg>
    129133        <seg>None</seg>
    130         <seg>$GNOME_PREFIX/share/yelp</seg>
     134        <seg><envar>$GNOME_PREFIX</envar>/share/yelp</seg>
    131135      </seglistitem>
    132136    </segmentedlist>
  • introduction/welcome/changelog.xml

    r7539d8f7 r551b9389  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[randy] - Minor fixes and clean-up to the core GNOME-2
     49          package instructions including standardizing the text in the
     50          'Command Explanations' section by using xinclude files and changing
     51          the creation of symbolic links to using PYTHONPATH so Python can
     52          find modules installed in non-standard locations.</para>
     53        </listitem>
     54        <listitem>
    4855          <para>[randy] - Added some new xinclude files to replace the
    4956          repetitive similar text in many package insructions.</para>
Note: See TracChangeset for help on using the changeset viewer.