--- loncom/build/Makefile 2006/06/05 23:19:30 1.181 +++ loncom/build/Makefile 2007/01/25 22:24:21 1.182.4.5 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.181 2006/06/05 23:19:30 albertel Exp $ +# $Id: Makefile,v 1.182.4.5 2007/01/25 22:24:21 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=CVS_HEAD +VERSION=2.3.2 # 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. @@ -478,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 @@ -494,19 +495,19 @@ postinstall: VERSION: install -d $(TARGET)/etc echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release - date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release + date +"%Y%m%d%H" >> $(TARGET)/etc/loncapa-release install -d $(TARGET)/home/httpd/html/lon-status echo -n "$(VERSION)-" > $(TARGET)/home/httpd/html/lon-status/version.txt - date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt + date +"%Y%m%d%H" >> $(TARGET)/home/httpd/html/lon-status/version.txt 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