[LON-CAPA-cvs] cvs: doc /loncapafiles loncapafiles.lpml loncom/build Makefile

[albertel]

albertel		Tue Aug 10 16:05:03 2004 EDT

  Modified files:              
    /loncom/build	Makefile 
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - better way of handling CHECKRPMS, maybe
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.166 loncom/build/Makefile:1.167
--- loncom/build/Makefile:1.166	Tue Aug 10 11:35:58 2004
+++ loncom/build/Makefile	Tue Aug 10 16:05:02 2004
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.166 2004/08/10 15:35:58 albertel Exp $
+# $Id: Makefile,v 1.167 2004/08/10 20:05:02 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -584,16 +584,16 @@
 # ------------------- MANIFEST the building, testing and standard loncapa files
 MANIFEST_lpml:
 	cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/installfiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 
 # ------------ Files for top-level (the vanilla layer that the user first sees)
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.384 doc/loncapafiles/loncapafiles.lpml:1.385
--- doc/loncapafiles/loncapafiles.lpml:1.384	Tue Aug 10 10:15:05 2004
+++ doc/loncapafiles/loncapafiles.lpml	Tue Aug 10 16:05:02 2004
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.384 2004/08/10 14:15:05 matthew Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.385 2004/08/10 20:05:02 albertel Exp $ -->
 
 <!--
 
@@ -1642,7 +1642,9 @@
 </dependencies>
 </file>
 <file>
-<source>loncom/build/CHECKRPMS</source>
+<source dist='default'>loncom/build/CHECKRPMS.default</source>
+<source dist='fedora1'>loncom/build/CHECKRPMS.fedora</source>
+<source dist='fedora2'>loncom/build/CHECKRPMS.fedora</source>
 <target dist='default'>home/httpd/cgi-bin/CHECKRPMS</target>
 <categoryname>script</categoryname>
 <description>CGI script that checks status of RPMs</description>
@@ -5641,7 +5643,7 @@
 </description>
 </file>
 <file>
-<source dist='default'>loncom/build/CHECKRPMS</source>
+<source dist='default'>loncom/build/CHECKRPMS.default</source>
 <source dist='fedora1'>loncom/build/CHECKRPMS.fedora</source>
 <source dist='fedora2'>loncom/build/CHECKRPMS.fedora</source>
 <target dist='default'>usr/local/loncapa/bin/CHECKRPMS</target>