--- loncom/build/lpml.dtd	2001/06/15 00:59:22	1.7
+++ loncom/build/lpml.dtd	2001/12/11 14:28:09	1.11
@@ -45,6 +45,7 @@
 <!ELEMENT sourcedir (#PCDATA)>
 <!ELEMENT glob (#PCDATA)>
 <!ELEMENT build (#PCDATA)>
+<!ELEMENT buildlink (#PCDATA)>
 
 <!-- 
 The trigger attribute of the build element is meant
@@ -56,14 +57,17 @@ Note that you must type this text exactl
 attribute value to be understood and processed correctly
 by the lpml "make build" parser.
 -->
-<!ELEMENT lpml (file|category|fileglob|directory|rpm)+>
+<!ELEMENT lpml (files|categories|directories|rpm)+>
 <!ATTLIST build>
    trigger CDATA #REQUIRED
 >
+<!ELEMENT categories category+>
+<!ELEMENT directories directory+>
+<!ELEMENT files (file|fileglob|link)+>
 <!ELEMENT dependencies (#PCDATA)>
 <!ELEMENT note (#PCDATA)>
 
-<!ELEMENT category (chmod,chown)>
+<!ELEMENT category (chmod,chown,abbreviation)>
 <!ATTLIST category
     type CDATA #REQUIRED
     name CDATA #REQUIRED
@@ -76,19 +80,20 @@ by the lpml "make build" parser.
 <!ATTLIST chmod
     dist CDATA #REQUIRED
     >
+<!ELEMENT abbreviation (#PCDATA)>
 
 <!ELEMENT directory (targetdir,categoryname,description?)>
 <!ATTLIST directory
     dist CDATA #REQUIRED
     >
 
-<!ELEMENT file (source,target+,categoryname,description?,
+<!ELEMENT file (source,target,categoryname,description?,
                 note?,build?,status?,dependencies?)>
 <!ELEMENT link (source,target,categoryname,description?,
-                note?,build?,status?)>
+                note?,build?,status?,dependencies?)>
 
 <!ELEMENT fileglob (glob,sourcedir,targetdir,categoryname,
-                    description?,filenames?)>
+                    description?,note?,build?,buildlink?,status?,dependencies?,filenames?)>
 <!ELEMENT filenames (#PCDATA)>
 
 <!ELEMENT rpm (rpmSummary,rpmName,rpmVersion,rpmRelease,rpmVendor,