svn commit: r43955 - head/en_US.ISO8859-1/books/porters-handbook/special

[Warren Block]

Author: wblock
Date: Sun Feb 16 03:09:35 2014
New Revision: 43955
URL: http://svnweb.freebsd.org/changeset/doc/43955

Log:
  Update and expand description of various make(1) implementations.
  Revised version of patch supplied.
  
  Submitted by:	Alexey Dokuchaev <danfe at FreeBSD.org>

Modified:
  head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml

Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
==============================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	Sun Feb 16 02:39:13 2014	(r43954)
+++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	Sun Feb 16 03:09:35 2014	(r43955)
@@ -313,39 +313,34 @@ IGNORE=	may not be redistributed because
       </sect2>
 
       <sect2 xml:id="using-make">
-	<title><command>make</command>, <command>gmake</command>, and
-	  <command>imake</command></title>
+	<title><command>make</command>, <command>gmake</command>,
+	  <command>fmake</command>, and <command>imake</command></title>
 
-	<para>If your port uses <application>GNU make</application>,
-	  set <literal>USES= gmake</literal>.</para>
-
-	<table frame="none">
-	  <title>Variables for Ports Related to
-	    <application>gmake</application></title>
-
-	  <tgroup cols="2">
-	    <thead>
-	      <row>
-		<entry>Variable</entry>
-		<entry>Means</entry>
-	      </row>
-	    </thead>
-
-	    <tbody>
-	      <row>
-		<entry><varname>USES= gmake</varname></entry>
-		<entry>The port requires <command>gmake</command> to
-		  build.</entry>
-	      </row>
-
-	      <row>
-		<entry><varname>GMAKE</varname></entry>
-		<entry>The full path for <command>gmake</command> if
-		  it is not in the <envar>PATH</envar>.</entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</table>
+	<para>Several differing <literal>make</literal>
+	  implementations exist.  Ported software often requires a
+	  particular implementation, like <acronym>GNU</acronym>
+	  <command>make</command>, known in &os; as
+	  <command>gmake</command>, or <command>fmake</command>, the
+	  legacy &os; <command>make</command>.</para>
+
+	<para>If the port uses <application>GNU make</application>,
+	  add <literal>gmake</literal> to <literal>USES</literal>.  If
+	  the legacy &os; <command>make</command> is needed, add
+	  <literal>fmake</literal> there.</para>
+
+	<para><varname>MAKE_CMD</varname> can be used to reference the
+	  specific command configured by the <literal>USES</literal>
+	  setting in the port's <filename>Makefile</filename>.  In
+	  rare cases when more than one <literal>make</literal>
+	  implementation is listed in <literal>USES</literal>, the
+	  variables <varname>GMAKE</varname> (for the
+	  <acronym>GNU</acronym> version) or <varname>FMAKE</varname>
+	  (for the legacy &os; version) are available.  Most ports
+	  should only use <varname>MAKE_CMD</varname> within the
+	  application <filename>Makefile</filename>s in
+	  <varname>WRKSRC</varname> to call the
+	  <command>make</command> implementation expected by the
+	  ported software.</para>
 
 	<para>If your port is an X application that creates
 	  <filename>Makefile</filename> files from