--- loncom/build/Makefile	2001/04/18 16:59:00	1.35
+++ loncom/build/Makefile	2001/09/17 20:44:21	1.39
@@ -5,6 +5,8 @@
 
 CDTARGET="."
 CDFSLOC="/mnt/loncapacd/install.lon-capa.org/3.1/currentcdsource"
+DIST="default"
+CATEGORY="development"
 
 all: 
 	# nothing yet here
@@ -39,7 +41,10 @@ HTML:
 status:
 	install -d HTML
 	cp ../../doc/loncapafiles/*.gif HTML
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html status > HTML/filestatus.html
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl html $(CATEGORY) $(DIST) "../.." "" > \
+	HTML/filestatus.html
+#	perl parse.pl ../../doc/loncapafiles/loncapafiles.html status > HTML/filestatus.html
 
 statuspost: status
 	cp ../../doc/loncapafiles/*.gif /home/httpd/html/lon-status
@@ -49,7 +54,8 @@ rpmstatus:
 	install -d RPMSTATUS
 	rpm -qa --queryformat '%{NAME}\t%{VERSION}\t%{BUILDTIME}\n' | sort > RPMSTATUS/current.tmp
 	cat ../../doc/otherfiles/cd_rpms.txt > RPMSTATUS/standard.tmp
-	perl rpmparse.pl RPMSTATUS/standard.tmp RPMSTATUS/current.tmp > RPMSTATUS/rpmstatus.html
+	cat ../../doc/otherfiles/rpm_list.txt > RPMSTATUS/expected.tmp
+	perl rpmparse.pl RPMSTATUS/standard.tmp RPMSTATUS/current.tmp RPMSTATUS/expected.tmp > RPMSTATUS/rpmstatus.html
 
 rpmstatuspost: rpmstatus
 	cp RPMSTATUS/rpmstatus.html /home/httpd/html/lon-status/rpmstatus.html
@@ -60,23 +66,33 @@ LCMakefile:
 SPEC:
 	perl parse.pl ../../doc/loncapafiles/loncapafiles.html SPEC
 
-configinstall: 
+configinstall: Makefile.configinstall
 	# there is a dependency on having directories in place, but oh well...
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html configinstall > Makefile.configinstall
 	make -f Makefile.configinstall SOURCE="../.." TARGET="" configfiles
 	perl loncaparestoreconfigurations lasttimestamp
 	make -f Makefile.configinstall TARGET="" configpermissions
 
-install: build
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html install > Makefile.install
+Makefile.configinstall: ../../doc/loncapafiles/loncapafiles.html
+	perl parse.pl ../../doc/loncapafiles/loncapafiles.html configinstall > Makefile.configinstall
+
+install: build Makefile.install
 	make -f Makefile.install SOURCE="../.." TARGET="" directories
 	make -f Makefile.install SOURCE="../.." TARGET="" files
 	make -f Makefile.install SOURCE="../.." TARGET="" links
 
-build:
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html build > Makefile.build
+Makefile.install: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl install $(CATEGORY) $(DIST) "../.." "" > \
+	Makefile.install
+
+build: Makefile.build
 	make -f Makefile.build all
 
+Makefile.build: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl build $(CATEGORY) $(DIST) "../.." "" > \
+	Makefile.build
+
 RPM: BinaryRoot
 	cat base_file_list.txt | perl make_rpm.pl base 3.1 '' '' BinaryRoot
 	cat setup_file_list.txt | perl make_rpm.pl setup 3.1 '' '' BinaryRoot