--- loncom/build/Makefile	2004/12/06 20:27:38	1.171
+++ loncom/build/Makefile	2005/12/06 04:07:39	1.178
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.171 2004/12/06 20:27:38 matthew Exp $
+# $Id: Makefile,v 1.178 2005/12/06 04:07:39 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.0.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,6 +119,9 @@ 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 "
@@ -126,7 +129,9 @@ help_TARGETS:
 	@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)"
@@ -406,6 +411,10 @@ cron_lpmlcheck:
 	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 | \
@@ -417,6 +426,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)
@@ -425,6 +439,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) | \
@@ -455,19 +474,28 @@ 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 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