--- loncom/build/Makefile	2005/09/01 06:49:34	1.177.2.2
+++ loncom/build/Makefile	2007/08/13 09:38:06	1.184.2.2
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.177.2.2 2005/09/01 06:49:34 albertel Exp $
+# $Id: Makefile,v 1.184.2.2 2007/08/13 09:38:06 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=2.0.1
+VERSION=2.5.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.
@@ -344,18 +344,7 @@ webserverconf:
 # ---------------- Top-level files such as README, UPDATE, CHECKRPMS, and TEST
 vanillatar:
 	# --------------------------- Point UPDATE to the internal make process
-	echo '#!/bin/sh' > $(SOURCE)/UPDATE
-	echo 'touch loncom/build/WARNINGS' >> $(SOURCE)/UPDATE;
-	echo 'ln -s loncom/build/WARNINGS WARNINGS' >> $(SOURCE)/UPDATE;
-	echo 'cd loncom/build; make build' >> $(SOURCE)/UPDATE
-	echo 'make rawinstall' >> $(SOURCE)/UPDATE
-	echo 'make configinstall' >> $(SOURCE)/UPDATE
-	echo 'make updatequery' >> $(SOURCE)/UPDATE
-	echo 'make hosts_and_domain_tab' >> $(SOURCE)/UPDATE
-	echo 'make postinstall' >> $(SOURCE)/UPDATE
-	echo 'make run_searchcat' >> $(SOURCE)/UPDATE
-	echo 'make aboutVERSION' >> $(SOURCE)/UPDATE
-	echo 'make warningnote' >> $(SOURCE)/UPDATE
+	cp  $(SOURCE)/loncom/UPDATE $(SOURCE)/UPDATE
 	# ----------------------------- Point TEST to the internal make process
 	echo '#!/bin/sh' > $(SOURCE)/TEST
 	echo 'cd loncom/build; make test' >> $(SOURCE)/TEST
@@ -459,6 +448,11 @@ reseval_fixup:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+update_queue_slots:
+	cat $(SOURCE)/doc/loncapafiles/update_queue_slots.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 clearoutoldspreadsheetcache:
 	cat $(SOURCE)/doc/loncapafiles/clearoutoldspreadsheetcache.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -484,6 +478,7 @@ postinstall:
 	make reseval_fixup
 	make clean_file_permissions
 	make accesscount_seed
+	make update_queue_slots
 	make modify_config_files
 	make clearoutoldspreadsheetcache
 	make chkconfig
@@ -507,12 +502,12 @@ VERSION:
 
 aboutVERSION:
 	cat $(SOURCE)/loncom/license/about.html | \
-	perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$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"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$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
@@ -595,6 +590,10 @@ MANIFEST_all:
 	echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
 	echo 'loncom/production_domain.tab' >> $(SOURCE)/MANIFEST
 	echo 'loncom/development_domain.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/production_dns_hosts.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/development_dns_hosts.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/production_dns_domain.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/development_dns_domain.tab' >> $(SOURCE)/MANIFEST
 	# ------------------ Files needed for dynamically generated directories
 	echo 'doc/man' >> $(SOURCE)/MANIFEST
 	echo 'doc/lib' >> $(SOURCE)/MANIFEST