documentation-guide/en_US module-struct.xml,1.3,1.4

Paul W. Frields (pfrields) fedora-docs-commits at redhat.com
Mon Mar 12 01:25:58 UTC 2007


Author: pfrields

Update of /cvs/docs/documentation-guide/en_US
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19485/en_US

Modified Files:
	module-struct.xml 
Log Message:
Update module information to match new include statement for Makefile.common


Index: module-struct.xml
===================================================================
RCS file: /cvs/docs/documentation-guide/en_US/module-struct.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- module-struct.xml	9 Mar 2007 01:16:05 -0000	1.3
+++ module-struct.xml	12 Mar 2007 01:25:56 -0000	1.4
@@ -122,7 +122,7 @@
       </para>
       <example id="ex-makefile">
 	<title>Sample Document Makefile</title>
-	<programlisting><![CDATA[DOCBASE         = example-doc
+	<screen><![CDATA[DOCBASE         = example-doc
 PRI_LANG        = en_US
 OTHERS          = de pt
 DOC_ENTITIES    = doc-entities
@@ -132,7 +132,11 @@
                   ${1}/para.xml
 endef
 
-include ../docs-common/Makefile.common]]></programlisting>
+define find-makefile-common
+for d in docs-common ../docs-common ../../docs-common; do 
+if [ -f $$d/Makefile.common ]; then echo "$$d/Makefile.common"; break; fi; done 
+endef
+include $(shell $(find-makefile-common))]]></screen>
       </example>
       <para>
 	Do not be concerned with some of the more complicated syntax
@@ -194,11 +198,11 @@
 	  discussed later in this guide.<!-- include xref --></para>
       </important>
       <para>
-	The final line, beginning with <literal>include</literal>,
-	references the main <filename>Makefile</filename> for the build
-	system. This <filename>Makefile.common</filename> file contains
-	all the <application>make(1)</application> targets and rules to
-	actually build the document and the various archives.
+	The final section, beginning with <literal>define</literal>,
+	locates the main <filename>Makefile.common</filename> for the
+	build system. This <filename>Makefile.common</filename> file
+	contains all the <application>make(1)</application> targets and
+	rules to actually build the document and the various archives.
       </para>
     </section>
     <section>




More information about the Fedora-docs-commits mailing list