--- loncom/build/Makefile	2001/09/08 22:37:34	1.38
+++ loncom/build/Makefile	2001/11/08 00:17:09	1.43
@@ -6,10 +6,17 @@
 CDTARGET="."
 CDFSLOC="/mnt/loncapacd/install.lon-capa.org/3.1/currentcdsource"
 DIST="default"
+CATEGORY="development"
 
 all: 
 	# nothing yet here
 
+test: TEST_system_dependencies
+	@echo "ALL SYSTEM DEPENDENCY TESTS SUCCESSFUL"
+
+TEST_system_dependencies:
+	cd system_dependencies; make
+
 cd: 
 	# Build temporary script to get cd
 	# make sure there is enough disk space
@@ -40,7 +47,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
@@ -48,7 +58,7 @@ statuspost: status
 
 rpmstatus:
 	install -d RPMSTATUS
-	rpm -qa --queryformat '%{NAME}\t%{VERSION}\t%{BUILDTIME}\n' | sort > RPMSTATUS/current.tmp
+	rpm -qa --queryformat '%{NAME}\t%{VERSION}\t%{RELEASE}\t%{BUILDTIME}\n' | sort > RPMSTATUS/current.tmp
 	cat ../../doc/otherfiles/cd_rpms.txt > RPMSTATUS/standard.tmp
 	cat ../../doc/otherfiles/rpm_list.txt > RPMSTATUS/expected.tmp
 	perl rpmparse.pl RPMSTATUS/standard.tmp RPMSTATUS/current.tmp RPMSTATUS/expected.tmp > RPMSTATUS/rpmstatus.html
@@ -63,29 +73,34 @@ SPEC:
 	perl parse.pl ../../doc/loncapafiles/loncapafiles.html SPEC
 
 configinstall: Makefile.configinstall
-	# there is a dependency on having directories in place, but oh well...
 	make -f Makefile.configinstall SOURCE="../.." TARGET="" configfiles
-	perl loncaparestoreconfigurations lasttimestamp
-	make -f Makefile.configinstall TARGET="" configpermissions
+#	perl loncaparestoreconfigurations lasttimestamp
+#	make -f Makefile.configinstall TARGET="" configpermissions
 
-Makefile.configinstall: ../../doc/loncapafiles/loncapafiles.html
-	perl parse.pl ../../doc/loncapafiles/loncapafiles.html configinstall > Makefile.configinstall
+Makefile.configinstall: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
+#	perl parse.pl ../../doc/loncapafiles/loncapafiles.html configinstall > Makefile.configinstall
+	cat ../../doc/loncapafiles/loncapafiles.lpml | \
+	perl lpml_parse.pl configinstall $(CATEGORY) $(DIST) "../.." "" > \
+	Makefile.configinstall
 
-install: build Makefile.install
+install: Makefile.install
 	make -f Makefile.install SOURCE="../.." TARGET="" directories
 	make -f Makefile.install SOURCE="../.." TARGET="" files
 	make -f Makefile.install SOURCE="../.." TARGET="" links
+	make configinstall
 
 Makefile.install: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
 	cat ../../doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl install development $(DIST) "../.." "" > \
+	perl lpml_parse.pl install $(CATEGORY) $(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
+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