Index: postlfs/security/nss.xml
===================================================================
--- postlfs/security/nss.xml	(revision 60bb78f8d02788209c96f4fbf919c06e9df320a0)
+++ postlfs/security/nss.xml	(revision a45062d508bff84381b9bfd3b851c873c8f3f69b)
@@ -9,5 +9,5 @@
   <!ENTITY nss-download-ftp
   "ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_13_3_RTM/src/nss-&nss-version;.tar.gz">
-  <!ENTITY nss-md5sum        "006cb82fa900e9e664b4b14a9b7810ca">
+  <!ENTITY nss-md5sum        "2510d41ade236584cc0096954ea449c0">
   <!ENTITY nss-size          "5.8 MB">
   <!ENTITY nss-buildsize     "70 MB (more than double this to run the test suite)">
@@ -115,8 +115,11 @@
 
 <screen><userinput>patch -Np1 -i ../nss-&nss-version;-standalone-1.patch &amp;&amp;
-cd mozilla/security/nss &amp;&amp;
-make nss_build_all $([ $(uname -m) = x86_64 ] &amp;&amp; echo USE_64=1) BUILD_OPT=1 \
-  NSPR_INCLUDE_DIR=/usr/include/nspr USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
-  $(cat /usr/include/sqlite3.h &amp;&gt; /dev/null &amp;&amp; echo NSS_USE_SYSTEM_SQLITE=1)</userinput></screen>
+cd mozilla/security/nss                                &amp;&amp;
+make nss_build_all BUILD_OPT=1                         \
+  NSPR_INCLUDE_DIR=/usr/include/nspr                   \
+  USE_SYSTEM_ZLIB=1                                    \
+  ZLIB_LIBS=-lz                                        \
+  $([ $(uname -m) = x86_64 ] &amp;&amp; echo USE_64=1) \
+  $([ -f /usr/include/sqlite3.h ] &amp;&amp; echo NSS_USE_SYSTEM_SQLITE=1)</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -174,13 +177,39 @@
 
     <para>
-      <parameter>[ $(uname -m) = x86_64 ] &amp;&amp; echo USE_64=1</parameter>:
-      This option is <emphasis>required on x86_64</emphasis>, otherwise the
-      <command>make</command> will attempt to create 32-bit objects and in a
-      non-multilib system it will fail. The [ $(arch) = x86_64 ] test ensures it
+      <parameter>BUILD_OPT=1</parameter>: This option is passed to
+      <command>make</command> so that the build is performed with no debugging
+      symbols built into the binaries and the default compiler optimizations are
+      used.
+    </para>
+
+    <para>
+      <parameter>NSPR_INCLUDE_DIR=/usr/include/nspr</parameter>: This option 
+      sets the location of the nspr headers.
+    </para>
+
+    <para>
+      <parameter>USE_SYSTEM_ZLIB=1</parameter>: This option is passed to
+      <command>make</command> to ensure that the
+      <filename class="libraryfile">libssl3.so</filename> library is linked to
+      the system installed <application>zlib</application> instead of the
+      in-tree version.
+    </para>
+
+    <para>
+      <parameter>ZLIB_LIBS=-lz</parameter>: This option provides the
+      linker flags needed to link to the system <application>zlib</application>.
+    </para>
+
+    <para>
+      <command>$([ $(uname -m) = x86_64 ] &amp;&amp; echo USE_64=1)</command>:
+      The <parameter>USE_64=1</parameter> option is <emphasis>required on
+      x86_64</emphasis>, otherwise <command>make</command> will try (and fail)
+      to create 32-bit objects. The [ $(uname -m) = x86_64 ] test ensures it
       has no effect on a 32 bit system.
     </para>
 
     <para>
-      <command>cat /usr/include/sqlite3.h ... </command>: This tests if
+      <command>([ -f /usr/include/sqlite3.h ] &amp;&amp; echo
+      NSS_USE_SYSTEM_SQLITE=1)</command>: This tests if
       <application>sqlite</application> is installed and if so it
       <command>echo</command>s the option NSS_USE_SYSTEM_SQLITE=1 to
@@ -188,29 +217,4 @@
       <filename class="libraryfile">libsoftokn3.so</filename> will link against
       the system version of sqlite.
-    </para>
-
-    <para>
-      <parameter>BUILD_OPT=1</parameter>: This option is passed to
-      <command>make</command> so that the build is performed with no debugging
-      symbols built into the binaries and the default compiler optimizations are
-      used.
-    </para>
-
-    <para>
-      <parameter>NSPR_INCLUDE_DIR=/usr/include/nspr</parameter>: This option 
-      sets the location of the nspr headers.
-    </para>
-
-    <para>
-      <parameter>USE_SYSTEM_ZLIB=1</parameter>: This option is passed to
-      <command>make</command> to ensure that the
-      <filename class="libraryfile">libssl3.so</filename> library is linked to
-      the system installed <application>zlib</application> instead of the
-      in-tree version.
-    </para>
-
-    <para>
-      <parameter>ZLIB_LIBS=-lz</parameter>: This option provides the
-      linker flags needed to link to the system <application>zlib</application>.
     </para>
   </sect2>
