Index: general/genutils/highlight.xml
===================================================================
--- general/genutils/highlight.xml	(revision c0b9aa944f0c7efdb38c5a958f0d70ac57ff56b6)
+++ general/genutils/highlight.xml	(revision ec0f2a5dfd5653efc28b2b378a61fc32075956c1)
@@ -112,5 +112,5 @@
     </para>
 
-<screen><userinput>make gui</userinput></screen>
+<screen><userinput>make gui doc_dir=/usr/share/doc/highlight-&highlight-version;/</userinput></screen>
 <!--
     <para>
@@ -130,5 +130,5 @@
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install doc_dir=/usr/share/doc/highlight-&highlight-version;/</userinput></screen>
 
     <para>
@@ -146,4 +146,15 @@
 <screen role="root"><userinput>cp -rv apidocs/html /usr/share/doc/highlight/apidocs</userinput></screen>
 -->
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>doc_dir=/usr/share/doc/highlight-&highlight-version;</parameter>:
+      install highlight documentation into a versioned directory. This
+      parameter is also needed for <command>make gui</command>, because
+      its value would be hardcoded into the gui executable.
+	</para>
   </sect2>
 
@@ -165,5 +176,5 @@
         <seg>
           /etc/highlight,
-          /usr/share/doc/highlight, and
+          /usr/share/doc/highlight/&highlight-version;, and
           /usr/share/highlight
         </seg>
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision c0b9aa944f0c7efdb38c5a958f0d70ac57ff56b6)
+++ general/graphlib/librsvg.xml	(revision ec0f2a5dfd5653efc28b2b378a61fc32075956c1)
@@ -108,5 +108,6 @@
 <screen><userinput>./configure --prefix=/usr    \
             --enable-vala    \
-            --disable-static &amp;&amp;
+            --disable-static \
+            --docdir=/usr/share/doc/librsvg-&librsvg-version; &amp;&amp;
 make</userinput></screen>
 
Index: general/sysutils/systemd.xml
===================================================================
--- general/sysutils/systemd.xml	(revision c0b9aa944f0c7efdb38c5a958f0d70ac57ff56b6)
+++ general/sysutils/systemd.xml	(revision ec0f2a5dfd5653efc28b2b378a61fc32075956c1)
@@ -189,4 +189,5 @@
       -Dhomed=false                 \
       -Duserdb=false                \
+      -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..                            &amp;&amp;
 
Index: multimedia/libdriv/flac.xml
===================================================================
--- multimedia/libdriv/flac.xml	(revision c0b9aa944f0c7efdb38c5a958f0d70ac57ff56b6)
+++ multimedia/libdriv/flac.xml	(revision ec0f2a5dfd5653efc28b2b378a61fc32075956c1)
@@ -98,5 +98,6 @@
 
 <screen><userinput>./configure --prefix=/usr \
-            --disable-thorough-tests &amp;&amp;
+            --disable-thorough-tests \
+            --docdir=/usr/share/doc/flac-&flac-version; &amp;&amp;
 make</userinput></screen>
 
Index: postlfs/filesystems/ntfs-3g.xml
===================================================================
--- postlfs/filesystems/ntfs-3g.xml	(revision c0b9aa944f0c7efdb38c5a958f0d70ac57ff56b6)
+++ postlfs/filesystems/ntfs-3g.xml	(revision ec0f2a5dfd5653efc28b2b378a61fc32075956c1)
@@ -116,5 +116,6 @@
 <screen><userinput>./configure --prefix=/usr        \
             --disable-static     \
-            --with-fuse=internal &amp;&amp;
+            --with-fuse=internal \
+            --docdir=/usr/share/doc/ntfs-3g-&ntfs-3g-version; &amp;&amp;
 make</userinput></screen>
 
Index: x/installing/libXdmcp.xml
===================================================================
--- x/installing/libXdmcp.xml	(revision c0b9aa944f0c7efdb38c5a958f0d70ac57ff56b6)
+++ x/installing/libXdmcp.xml	(revision ec0f2a5dfd5653efc28b2b378a61fc32075956c1)
@@ -99,5 +99,5 @@
     </para>
 
-<screen><userinput>./configure $XORG_CONFIG &amp;&amp;
+<screen><userinput>./configure $XORG_CONFIG --docdir=/usr/share/doc/libXdmcp-&libXdmcp-version; &amp;&amp;
 make</userinput></screen>
 
