--- loncom/build/Makefile 2006/08/11 22:53:08 1.182.2.4 +++ loncom/build/Makefile 2007/03/20 01:51:39 1.182.4.6 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.182.2.4 2006/08/11 22:53:08 albertel Exp $ +# $Id: Makefile,v 1.182.4.6 2007/03/20 01:51:39 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.1.99.3 +VERSION=2.3.3 # 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. @@ -495,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