--- loncom/build/Makefile	2001/04/03 13:27:41	1.34
+++ loncom/build/Makefile	2001/09/08 22:37:34	1.38
@@ -5,6 +5,7 @@
 
 CDTARGET="."
 CDFSLOC="/mnt/loncapacd/install.lon-capa.org/3.1/currentcdsource"
+DIST="default"
 
 all: 
 	# nothing yet here
@@ -49,7 +50,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 +62,31 @@ 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 development $(DIST) "../.." "" > \
+	Makefile.install
+
+build: Makefile.build
 	make -f Makefile.build all
 
+Makefile.build: ../../doc/loncapafiles/loncapafiles.html
+	perl parse.pl ../../doc/loncapafiles/loncapafiles.html build > 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
@@ -114,8 +124,10 @@ install.lon-capa.org: cvsreport
 	install ../../doc/build/instructions_with_cd.html docs/3.1/instructions_with_cd.html
 	install ../../doc/build/libraryserverconfiguration.gif docs/3.1/libraryserverconfiguration.gif
 	install ../../doc/build/librarysystemsettings.gif docs/3.1/librarysystemsettings.gif
+	install -d docs/cvsupgrade
+	install ../../doc/build/cvsupgrade.html docs/cvsupgrade/index.html
 	install -d docs/upgrade
-	install ../../doc/build/install.html docs/upgrade/index.html
+	install ../../doc/build/upgrade.html docs/upgrade/index.html
 	install -d docs/reconfig
 	install ../../doc/build/reconfig.html docs/reconfig/index.html
 	install -d docs/3.1/otherfiles