--- loncom/build/Makefile	2012/02/08 02:19:12	1.190.8.7.2.2
+++ loncom/build/Makefile	2011/03/24 02:04:46	1.196
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.190.8.7.2.2 2012/02/08 02:19:12 raeburn Exp $
+# $Id: Makefile,v 1.196 2011/03/24 02:04:46 raeburn Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -13,10 +13,6 @@ DIST=$(DISTPROBE)
 CATEGORY="development"
 SOURCE=../..
 TARGET=""
-CURRSHELL=`echo $(SHELL)`
-ifneq ('/bin/bash',${CURRSHELL})
-CURRSHELL=/bin/bash
-endif
 NORESTORECONF="0"
 HOSTNAME=""
 LAUNCH=| perl
@@ -26,7 +22,7 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=2.10.1-MITr.1
+VERSION=CVS_HEAD
 SHOWVERSION=$(VERSION)
 NEXTVERSION=2.11
 ifeq (CVS_HEAD,${VERSION})
@@ -136,7 +132,6 @@ help_TARGETS:
 	@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 "langcheck: test to see if root bash and OS are using English."
 	@echo "ntpcheck: test to see if ntp is installed and running."
 	@echo "html_parser_check: test functionality of HTML::Parser."
 	@echo "math_random_check: test functionality of Math::Random."
@@ -399,11 +394,6 @@ tardist:
 	rm -f $(SOURCE)/tar_WARNINGS
 	make warningnote
 
-langcheck:
-	cat $(SOURCE)/doc/loncapafiles/langcheck.piml | \
-	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
-	tee -a WARNINGS
-
 ntpcheck:
 	cat $(SOURCE)/doc/loncapafiles/ntpcheck.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -531,7 +521,6 @@ postinstall:
 	make update_queue_slots
 	make modify_config_files
 	make clearoutoldspreadsheetcache
-	make langcheck
 	make chkconfig
 	make rpmcheck
 	make ntpcheck
@@ -546,8 +535,7 @@ postinstall:
 	make picins_check
 	make mimetex_version_check
 	make verify_domconfiguser
-	make latex_fmtutil
-	sed -i "s/\x08\x08*/.../g" WARNINGS
+	make latex_fmtutil 
 VERSION:
 	install -d $(TARGET)/etc
 	echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
@@ -559,52 +547,40 @@ VERSION:
 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 \-\-\>|\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
-	touch --date="$(shell echo `perl getcvsdate.pl \
-	$(SOURCE)/loncom/license/CVS/Entries about.html`)" \
-	$(SOURCE)/loncom/license/about.html
-	cp -p -v $(SOURCE)/loncom/loncapa_apache.conf \
-	$(SOURCE)/loncom/loncapa_apache.conf.orig
 	cat $(SOURCE)/loncom/loncapa_apache.conf | \
 	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
-	touch --date="$(shell echo `perl getcvsdate.pl \
-	$(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \
-	$(SOURCE)/loncom/loncapa_apache.conf
 
 postaboutVERSION:
 	if (test -e $(SOURCE)/loncom/license/about.html.orig) && \
-		(diff $(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.orig \
+		!(diff $(SOURCE)/loncom/license/about.html \
 		$(SOURCE)/loncom/license/about.html > /dev/null); then \
 		rm -f $(SOURCE)/loncom/license/about.html.orig; \
 	fi
-	touch --date="$(shell echo `perl getcvsdate.pl \
-	$(SOURCE)/loncom/license/CVS/Entries about.html`)" \
-	$(SOURCE)/loncom/license/about.html
 	if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
-		(diff $(SOURCE)/loncom/loncapa_apache.conf.orig \
-		$(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \
+		(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/loncapa_apache.conf.orig \
-		$(SOURCE)/loncom/loncapa_apache.conf > /dev/null); then \
+		!(diff $(SOURCE)/loncom/license/about.html \
+		$(SOURCE)/loncom/license/about.html > /dev/null); then \
 		rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \
 	fi
-	touch --date="$(shell echo `perl getcvsdate.pl \
-	$(SOURCE)/loncom/CVS/Entries loncapa_apache.conf`)" \
-	$(SOURCE)/loncom/loncapa_apache.conf
 
 # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
 
@@ -617,7 +593,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)" \
-	"$(CURRSHELL)" > Makefile.build
+	> Makefile.build
 
 Makefile.install: alwaysrun
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \