--- loncom/build/Makefile	2004/05/19 16:31:43	1.159
+++ loncom/build/Makefile	2005/03/18 20:07:21	1.173
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.159 2004/05/19 16:31:43 matthew Exp $
+# $Id: Makefile,v 1.173 2005/03/18 20:07:21 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -119,7 +119,16 @@ help_TARGETS:
 	@echo "         system"
 	@echo "sanitycheck: probe for common errors and recommend fixes to"
 	@echo "             the user"
+	@echo "clean_file_permissions: Remove erroneous keys from the  "
+	@echo "    file_permissions.db"
+	@echo "accesscount_seed: Migrate the access counting mechanism from "
+	@echo "    nohist_reseval.db to nohist_accesscount.db."
+	@echo "modify_config_files: Perform automatic update of the "
+	@echo "    configuration files for yum and MySQL."
 	@echo "ntpcheck: test to see if ntp is installed and running."
+	@echo "html_parser_check: test functionality of HTML::Parser."
+	@echo "cron_lpmlcheck: remove cron file /etc/cron.d/loncapa.lpml."
+	@echo "chkconfig: test runlevels of httpd and loncontrol."
 	@echo "rpmcheck: test to see if rpms known to confict are installed."
 	@echo "updatequery: solicit the user for machine configuration"
 	@echo "             information; to be incorporated during an update"
@@ -327,7 +336,8 @@ hosts_and_domain_tab: TEST_hosts_tab TES
 
 webserverconf:
 	cat $(SOURCE)/doc/loncapafiles/webserver.piml | \
-	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH)
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
 
 # ---------------- Top-level files such as README, UPDATE, CHECKRPMS, and TEST
 vanillatar:
@@ -341,6 +351,7 @@ vanillatar:
 	echo 'make updatequery' >> $(SOURCE)/UPDATE
 	echo 'make hosts_and_domain_tab' >> $(SOURCE)/UPDATE
 	echo 'make postinstall' >> $(SOURCE)/UPDATE
+	echo 'make run_searchcat' >> $(SOURCE)/UPDATE
 	echo 'make aboutVERSION' >> $(SOURCE)/UPDATE
 	echo 'make warningnote' >> $(SOURCE)/UPDATE
 	# ----------------------------- Point TEST to the internal make process
@@ -388,6 +399,21 @@ ntpcheck:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+html_parser_check:
+	cat $(SOURCE)/doc/loncapafiles/html_parser_check.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+cron_lpmlcheck:
+	cat $(SOURCE)/doc/loncapafiles/cron_lpmlcheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+chkconfig:
+	cat $(SOURCE)/doc/loncapafiles/chkconfig.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 rpmcheck:
 	cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -402,11 +428,25 @@ updatequery:
 	cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
 
+run_searchcat:
+	cat $(SOURCE)/doc/loncapafiles/run_searchcat.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
+
+clean_file_permissions:
+	cat $(SOURCE)/doc/loncapafiles/clean_file_permissions.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 accesscount_seed:
 	cat $(SOURCE)/doc/loncapafiles/accesscount_seed.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+modify_config_files:
+	cat $(SOURCE)/doc/loncapafiles/modify_config_files.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 reseval_fixup:
 	cat $(SOURCE)/doc/loncapafiles/reseval_fixup.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -430,10 +470,15 @@ ownership_fix:
 postinstall:
 	make webserverconf
 	make reseval_fixup
+	make clean_file_permissions
 	make accesscount_seed
+	make modify_config_files
 	make clearoutoldspreadsheetcache
+	make chkconfig
 	make rpmcheck
 	make ntpcheck
+	make html_parser_check
+	make cron_lpmlcheck
 	make sanitycheck
 	make sendmail_fix
 	make ownership_fix
@@ -561,16 +606,16 @@ MANIFEST_cvs:
 # ------------------- 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)
@@ -668,6 +713,10 @@ BinaryRoot: base_rpm_file_list
 
 # ======================================== *** MASTER DOCUMENTATION TARGETS ***
 
+buildwebsite:
+	cd ../../doc/build; perl ./generate_web_pages.pl
+
+
 # Generates CVS:loncom/build/docs; root location of install.lon-capa.org
 doc:
 	install -d docs