r7028 - in trunk/BOOK: gnome/core xsoft/office

randy at linuxfromscratch.org randy at linuxfromscratch.org
Wed Aug 8 07:57:59 PDT 2007


Author: randy
Date: 2007-08-08 08:57:59 -0600 (Wed, 08 Aug 2007)
New Revision: 7028

Modified:
   trunk/BOOK/gnome/core/gail.xml
   trunk/BOOK/gnome/core/libgnomeui.xml
   trunk/BOOK/xsoft/office/abiword.xml
   trunk/BOOK/xsoft/office/gnumeric.xml
Log:
Simplified some commands using conditionals in various package instructions

Modified: trunk/BOOK/gnome/core/gail.xml
===================================================================
--- trunk/BOOK/gnome/core/gail.xml	2007-08-08 05:41:16 UTC (rev 7027)
+++ trunk/BOOK/gnome/core/gail.xml	2007-08-08 14:57:59 UTC (rev 7028)
@@ -91,19 +91,14 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &&
 
-    <para><application>GTK+</application> will look for the
-    <application>GAIL</application> modules in
-    <filename class='directory'>/usr/lib</filename> even if
-    <envar>$GNOME_PREFIX</envar> is <emphasis>NOT</emphasis>
-    <filename class='directory'>/usr</filename>. If <envar>$GNOME_PREFIX</envar>
-    is anything other than <filename class='directory'>/usr</filename>, create
-    a symlink to <envar>$GNOME_PREFIX</envar> to satisfy this requirement:</para>
+if [ $(pkg-config --variable=prefix ORBit-2.0) != "/usr" ]; then
+    ln -v -s $(pkg-config --variable=prefix \
+             ORBit-2.0)/lib/gtk-2.0/modules \
+         /usr/lib/gtk-2.0
+fi</userinput></screen>
 
-<screen role="root"><userinput>ln -v -s $(pkg-config --variable=prefix ORBit-2.0)/lib/gtk-2.0/modules \
-         /usr/lib/gtk-2.0</userinput></screen>
-
   </sect2>
 
   <sect2 role="commands">
@@ -115,6 +110,14 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
+    <para><command>if [ ... != "/usr" ]; then ...; fi</command>:
+    <application>GTK+</application> will look for the
+    <application>GAIL</application> modules in
+    <filename class='directory'>/usr/lib</filename> even if
+    <envar>$GNOME_PREFIX</envar> is NOT
+    <filename class='directory'>/usr</filename>. This command creates a
+    symbolic link to satisfy this requirement.</para>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/gnome/core/libgnomeui.xml
===================================================================
--- trunk/BOOK/gnome/core/libgnomeui.xml	2007-08-08 05:41:16 UTC (rev 7027)
+++ trunk/BOOK/gnome/core/libgnomeui.xml	2007-08-08 14:57:59 UTC (rev 7028)
@@ -86,17 +86,14 @@
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &&
 
-    <para>If your <application>GNOME</application> installation prefix is
-    anything other than <filename class='directory'>/usr</filename>, create
-    the following symbolic link as the
-    <systemitem class="username">root</systemitem> user:</para>
+if [ $(pkg-config --variable=prefix ORBit-2.0) != "/usr" ]; then
+    ln -v -s $(pkg-config --variable=prefix \
+             ORBit-2.0)/lib/gtk-&gtk2-working-dir;/filesystems \
+        /usr/lib/gtk-&gtk2-working-dir;
+fi</userinput></screen>
 
-<screen role="root"><userinput>ln -v -s $(pkg-config \
-      --variable=prefix ORBit-2.0)/lib/gtk-2.0/2.10.0/filesystems \
-      /usr/lib/gtk-2.0/2.10.0</userinput></screen>
-
   </sect2>
 
   <sect2 role="commands">
@@ -118,6 +115,11 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
+    <para><command>if [ ... != "/usr" ]; then ...; fi</command>:
+    This command is used to create a symbolic link in instances where the
+    <application>GNOME</application> installation prefix is
+    anything other than <filename class='directory'>/usr</filename>.</para>
+
   </sect2>
 
   <sect2 role="configuration">

Modified: trunk/BOOK/xsoft/office/abiword.xml
===================================================================
--- trunk/BOOK/xsoft/office/abiword.xml	2007-08-08 05:41:16 UTC (rev 7027)
+++ trunk/BOOK/xsoft/office/abiword.xml	2007-08-08 14:57:59 UTC (rev 7028)
@@ -183,18 +183,16 @@
                  -type d -exec chmod -v 755 {} \;</userinput></screen>
 
     <para>If you have a <application>GNOME</application> installation, issue
-    the following command as the <systemitem class="username">root</systemitem>
+    the following commands as the <systemitem class="username">root</systemitem>
     user to install the <application>AbiWord</application> Bonobo component
     description file:</para>
 
 <screen role="root"><userinput>install -v -m644 abidistfiles/GNOME_AbiWord_Control_&AbiWord-under-version;.server \
-        $(pkg-config --variable=prefix ORBit-2.0)/lib/bonobo/servers</userinput></screen>
+        $(pkg-config --variable=prefix ORBit-2.0)/lib/bonobo/servers &&
 
-    <para>If the <application>GNOME</application> installation is in any prefix
-    other than <filename class='directory'>/usr</filename>, remove unneeded
-    directories by issuing the following command as the
-    <systemitem class="username">root</systemitem> user:
-    <command>rmdir -v /usr/lib/{bonobo/servers,bonobo}</command>.</para>
+if [ $(pkg-config --variable=prefix ORBit-2.0) != "/usr" ]; then
+    rmdir -v /usr/lib/{bonobo/servers,bonobo}
+fi</userinput></screen>
 
     <para>If you built the API documentation, install it by issuing the
     following commands as the <systemitem class="username">root</systemitem>
@@ -222,6 +220,11 @@
     <application>GCC</application> and the
     <application>libots</application> package.</para>
 
+    <para><command>if [ ... != "/usr" ]; then ...;fi</command>:
+    This command is used to remove unneeded directories if the
+    <application>GNOME</application> installation is in any prefix
+    other than <filename class='directory'>/usr</filename>.</para>
+
   </sect2>
 
   <sect2 role="configuration">

Modified: trunk/BOOK/xsoft/office/gnumeric.xml
===================================================================
--- trunk/BOOK/xsoft/office/gnumeric.xml	2007-08-08 05:41:16 UTC (rev 7027)
+++ trunk/BOOK/xsoft/office/gnumeric.xml	2007-08-08 14:57:59 UTC (rev 7028)
@@ -113,20 +113,16 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role='root'><userinput>make install &&
+
 ln -v -s -f /usr/share/gnome/help/gnumeric \
-            /usr/share/gnumeric/&gnumeric-version;/doc</userinput></screen>
+            /usr/share/gnumeric/&gnumeric-version;/doc &&
 
-    <para>If you have a <application>GNOME</application> installation in any
-    prefix other than <filename class='directory'>/usr</filename>, issue
-    the following commands as the <systemitem class="username">root</systemitem>
-    user to move the <application>Gnumeric</application> Bonobo component
-    description file into the <envar>$GNOME_PREFIX</envar> heirarchy and
-    then remove the unneeded directories:</para>
+if [ $(pkg-config --variable=prefix ORBit-2.0) != "/usr" ]; then
+    mv -v /usr/lib/bonobo/servers/GNOME_Gnumeric.server \
+        $(pkg-config --variable=prefix ORBit-2.0)/lib/bonobo/servers &&
+    rmdir -v /usr/lib/{bonobo/servers,bonobo}
+fi</userinput></screen>
 
-<screen role='root'><userinput>mv -v /usr/lib/bonobo/servers/GNOME_Gnumeric.server \
-    $(pkg-config --variable=prefix ORBit-2.0)/lib/bonobo/servers &&
-rmdir -v /usr/lib/{bonobo/servers,bonobo}</userinput></screen>
-
     <para>If you have <xref linkend="gnome-doc-utils"/> installed you can
     create an HTML version of the Help documentation by issuing the following
     commands:</para>
@@ -182,6 +178,13 @@
     This rebuilds the <filename>Makefile</filename>s with the same prefix used 
     in the <application>GNOME Doc Utils</application> installation.</para>
 
+    <para><command>if [ ... != "/usr" ]; then ...; fi</command>:
+    This command is used to move the <application>Gnumeric</application> Bonobo
+    component description file into the <envar>$GNOME_PREFIX</envar> heirarchy
+    and then remove the unneeded directories only if the
+    <application>GNOME</application> installation is in any
+    prefix other than <filename class='directory'>/usr</filename>.</para>
+
   </sect2>
 
   <sect2 role="content">




More information about the blfs-book mailing list