--- loncom/build/Makefile	2009/10/09 20:05:52	1.188.2.6
+++ loncom/build/Makefile	2011/05/13 12:04:56	1.190.8.5
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.188.2.6 2009/10/09 20:05:52 raeburn Exp $
+# $Id: Makefile,v 1.190.8.5 2011/05/13 12:04:56 raeburn Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -13,6 +13,10 @@ DIST=$(DISTPROBE)
 CATEGORY="development"
 SOURCE=../..
 TARGET=""
+CURRSHELL=`echo $(SHELL)`
+ifneq ('/bin/bash',${CURRSHELL})
+CURRSHELL=/bin/bash
+endif
 NORESTORECONF="0"
 HOSTNAME=""
 LAUNCH=| perl
@@ -22,7 +26,13 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=2.8.2
+VERSION=2.10.0
+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 +148,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)"
@@ -147,6 +158,8 @@ help_TARGETS:
 	@echo "         /home/httpd/html/lon-status/version.txt"
 	@echo "aboutVERSION: place version information inside about.html"
 	@echo "              and loncapa_apache.conf"
+	@echo "postaboutVERSION: restore default version <!-- VERSION --> to"
+	@echo "                  about.html and loncapa_apache.conf"
 	@echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***"
 	@echo "Makefile.configinstall: generate a Makefile for configuration"
 	@echo "                        files; built dynamically from"
@@ -308,6 +321,7 @@ configinstall: Makefile.configinstall
 
 install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile
 	echo -n "" > WARNINGS
+	make aboutVERSION
 	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
 	directories
 	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
@@ -316,7 +330,7 @@ install: buildflag VERSION TEST_hosts_ta
 	NORESTORECONF="$(NORESTORECONF)" configinstall
 	make postinstall
 	make warningnote
-	@echo "You can now run 'make test' to see if your system is ready to go!"
+#	@echo "You can now run 'make test' to see if your system is ready to go!"
 #	@echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
 #	@echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
 #	@echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
@@ -374,18 +388,11 @@ tardist:
 	else \
 		ln -s . $(DIRTARGET); \
 	fi
-	cp -v $(SOURCE)/loncom/license/about.html \
-	$(SOURCE)/loncom/license/about.html.orig
-	cp -v $(SOURCE)/loncom/loncapa_apache.conf \
-	$(SOURCE)/loncom/loncapa_apache.conf.orig
 	make aboutVERSION
 	cd $(SOURCE); \
 	tar --no-recursion --numeric-owner --files-from MANIFEST \
 	-h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS || [ "0" == "0" ]
-	mv -v $(SOURCE)/loncom/license/about.html.orig \
-	$(SOURCE)/loncom/license/about.html
-	mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
-	$(SOURCE)/loncom/loncapa_apache.conf
+	make postaboutVERSION
 	cat $(SOURCE)/tar_WARNINGS | \
 	xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
 	rm -f $(SOURCE)/tar_WARNINGS
@@ -499,7 +506,18 @@ 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 postaboutVERSION
 	make webserverconf
 	make reseval_fixup
 	make clean_file_permissions
@@ -520,6 +538,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
@@ -529,17 +549,43 @@ VERSION:
 	date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt
 
 aboutVERSION:
+	cp -p -v $(SOURCE)/loncom/license/about.html \
+	$(SOURCE)/loncom/license/about.html.orig
+	cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \
+	$(SOURCE)/loncom/loncapa_apache.conf.orig
 	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
 
+postaboutVERSION:
+	if (test -e $(SOURCE)/loncom/license/about.html.orig) && \
+		(diff $(SOURCE)/loncom/license/about.html \
+		$(SOURCE)/loncom/license/about.html > /dev/null); then \
+		mv -v $(SOURCE)/loncom/license/about.html.orig \
+		$(SOURCE)/loncom/license/about.html; \
+	elif (test -e $(SOURCE)/loncom/license/about.html.orig) && \
+		!(diff $(SOURCE)/loncom/license/about.html \
+		$(SOURCE)/loncom/license/about.html > /dev/null); then \
+		rm -f $(SOURCE)/loncom/license/about.html.orig; \
+	fi
+	if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
+		(diff $(SOURCE)/loncom/license/about.html \
+		$(SOURCE)/loncom/license/about.html > /dev/null); then \
+		mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
+		$(SOURCE)/loncom/loncapa_apache.conf; \
+	elif (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
+		!(diff $(SOURCE)/loncom/license/about.html \
+		$(SOURCE)/loncom/license/about.html > /dev/null); then \
+		rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \
+	fi
+
 # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
 
 Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml \
@@ -551,7 +597,7 @@ Makefile.configinstall: $(SOURCE)/doc/lo
 Makefile.build: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
 	perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" \
-	> Makefile.build
+	"$(CURRSHELL)" > Makefile.build
 
 Makefile.install: alwaysrun
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \