--- loncom/build/Makefile	2011/11/08 21:46:11	1.190.8.7
+++ loncom/build/Makefile	2010/04/03 01:13:47	1.191
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.190.8.7 2011/11/08 21:46:11 raeburn Exp $
+# $Id: Makefile,v 1.191 2010/04/03 01:13:47 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,13 +22,7 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=2.10.1
-SHOWVERSION=$(VERSION)
-NEXTVERSION=2.11
-ifeq (CVS_HEAD,${VERSION})
-SHOWVERSION=$(NEXTVERSION).$(VERSION)
-endif
-#
+VERSION=CVS_HEAD
 # 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.
@@ -136,7 +126,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."
@@ -159,8 +148,6 @@ 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"
@@ -322,7 +309,6 @@ 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
@@ -331,7 +317,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)"
@@ -389,21 +375,23 @@ 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" ]
-	make postaboutVERSION
+	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
 	cat $(SOURCE)/tar_WARNINGS | \
 	xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
 	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) | \
@@ -523,7 +511,6 @@ latex_fmtutil:
 	tee -a WARNINGS
 
 postinstall:
-	make postaboutVERSION
 	make webserverconf
 	make reseval_fixup
 	make clean_file_permissions
@@ -531,7 +518,6 @@ postinstall:
 	make update_queue_slots
 	make modify_config_files
 	make clearoutoldspreadsheetcache
-	make langcheck
 	make chkconfig
 	make rpmcheck
 	make ntpcheck
@@ -546,7 +532,7 @@ postinstall:
 	make picins_check
 	make mimetex_version_check
 	make verify_domconfiguser
-	make latex_fmtutil
+	make latex_fmtutil 
 VERSION:
 	install -d $(TARGET)/etc
 	echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
@@ -556,43 +542,17 @@ 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 \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \
+	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$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 \-\-\>|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \
+	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$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 \
@@ -604,7 +564,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 | \