--- loncom/build/Makefile	2008/12/18 22:30:20	1.189
+++ loncom/build/Makefile	2011/02/27 03:09:22	1.193
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.189 2008/12/18 22:30:20 raeburn Exp $
+# $Id: Makefile,v 1.193 2011/02/27 03:09:22 raeburn Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -23,6 +23,12 @@ LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
 VERSION=CVS_HEAD
+SHOWVERSION=$(VERSION)
+NEXTVERSION=2.11
+ifeq (CVS_HEAD,${VERSION})
+SHOWVERSION=$(NEXTVERSION).$(VERSION)
+endif
+#
 # 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.
@@ -138,6 +144,7 @@ help_TARGETS:
 	@echo "             filename databases used by LaTeX"
 	@echo "mimetex_version_check: check if mimetex.cgi version has changed,"
 	@echo "                      if so remove files from mimetexcache."
+	@echo "latex_fmtutil: run utility to maintain TeX format files system-wide."
 	@echo "updatequery: solicit the user for machine configuration"
 	@echo "             information; to be incorporated during an update"
 	@echo "             procedure (via the UPDATE command)"
@@ -499,6 +506,16 @@ mimetex_version_check:
 	perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+verify_domconfiguser:
+	cat $(SOURCE)/doc/loncapafiles/verify_domconfiguser.piml | \
+	perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+latex_fmtutil:
+	cat $(SOURCE)/doc/loncapafiles/latex_fmtutil.piml | \
+	perl piml_parse.pl  $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 postinstall:
 	make webserverconf
 	make reseval_fixup
@@ -520,6 +537,8 @@ postinstall:
 	make latex_fixup
 	make picins_check
 	make mimetex_version_check
+	make verify_domconfiguser
+	make latex_fmtutil 
 VERSION:
 	install -d $(TARGET)/etc
 	echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
@@ -530,12 +549,12 @@ VERSION:
 
 aboutVERSION:
 	cat $(SOURCE)/loncom/license/about.html | \
-	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \
 	$(SOURCE)/loncom/license/about.html.new
 	mv -v $(SOURCE)/loncom/license/about.html.new \
 	$(SOURCE)/loncom/license/about.html
 	cat $(SOURCE)/loncom/loncapa_apache.conf | \
-	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \
 	$(SOURCE)/loncom/loncapa_apache.conf.new
 	mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
 	$(SOURCE)/loncom/loncapa_apache.conf