--- loncom/build/Makefile	2004/08/13 15:51:11	1.168
+++ loncom/build/Makefile	2006/06/27 15:31:26	1.182.2.1
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.168 2004/08/13 15:51:11 albertel Exp $
+# $Id: Makefile,v 1.182.2.1 2006/06/27 15:31:26 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -22,7 +22,7 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=CVS_HEAD
+VERSION=2.1.99.0
 # The current working definition for "RELEASE" is: changes not in the software,
 # but in the operating system dependent packaging of the software.  Thus, the
 # generic tarball releases do not need to have a release number specified.
@@ -119,13 +119,19 @@ help_TARGETS:
 	@echo "         system"
 	@echo "sanitycheck: probe for common errors and recommend fixes to"
 	@echo "             the user"
+	@echo "logcleanup: clean spurious logfile entries"
+	@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 "wrap_setuid: put a C wrapper around setuid scripts."
 	@echo "updatequery: solicit the user for machine configuration"
 	@echo "             information; to be incorporated during an update"
 	@echo "             procedure (via the UPDATE command)"
@@ -338,18 +344,7 @@ webserverconf:
 # ---------------- Top-level files such as README, UPDATE, CHECKRPMS, and TEST
 vanillatar:
 	# --------------------------- Point UPDATE to the internal make process
-	echo '#!/bin/sh' > $(SOURCE)/UPDATE
-	echo 'touch loncom/build/WARNINGS' >> $(SOURCE)/UPDATE;
-	echo 'ln -s loncom/build/WARNINGS WARNINGS' >> $(SOURCE)/UPDATE;
-	echo 'cd loncom/build; make build' >> $(SOURCE)/UPDATE
-	echo 'make rawinstall' >> $(SOURCE)/UPDATE
-	echo 'make configinstall' >> $(SOURCE)/UPDATE
-	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
+	cp  $(SOURCE)/loncom/UPDATE $(SOURCE)/UPDATE
 	# ----------------------------- Point TEST to the internal make process
 	echo '#!/bin/sh' > $(SOURCE)/TEST
 	echo 'cd loncom/build; make test' >> $(SOURCE)/TEST
@@ -395,11 +390,20 @@ 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 | \
@@ -411,6 +415,11 @@ sanitycheck:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+logcleanup:
+	cat $(SOURCE)/doc/loncapafiles/logcleanup.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 updatequery:
 	cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
@@ -419,6 +428,11 @@ 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) | \
@@ -434,6 +448,11 @@ reseval_fixup:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+update_queue_slots:
+	cat $(SOURCE)/doc/loncapafiles/update_queue_slots.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 clearoutoldspreadsheetcache:
 	cat $(SOURCE)/doc/loncapafiles/clearoutoldspreadsheetcache.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -449,18 +468,29 @@ ownership_fix:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+wrap_setuid:
+	cat $(SOURCE)/doc/loncapafiles/wrap_setuid.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 postinstall:
 	make webserverconf
 	make reseval_fixup
+	make clean_file_permissions
 	make accesscount_seed
+	make update_queue_slots
 	make modify_config_files
 	make clearoutoldspreadsheetcache
+	make chkconfig
 	make rpmcheck
 	make ntpcheck
+	make html_parser_check
 	make cron_lpmlcheck
 	make sanitycheck
+	make logcleanup
 	make sendmail_fix
 	make ownership_fix
+	make wrap_setuid
 
 VERSION:
 	install -d $(TARGET)/etc