Changeset adb02f98 for gnome

Timestamp:

08/08/2007 02:57:59 PM (17 years ago)

Author:

Randy McMurchy <randy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

9c84fd7

Parents:

70ce8cb

Message:

Simplified some commands using conditionals in various package instructions

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7028 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

gnome/core

Files:

• gail.xml (modified) (2 diffs)
• libgnomeui.xml (modified) (2 diffs)

gnome/core/gail.xml

@@ -92 +92 @@
     <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 &amp;&amp;
 
-    <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>
-
-<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>
+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>
 
   </sect2>
@@ -115 +110 @@
     <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>

gnome/core/libgnomeui.xml

@@ -87 +87 @@
     <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 &amp;&amp;
 
-    <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>
-
-<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>
+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>
 
   </sect2>
@@ -118 +115 @@
     <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>