--- loncom/build/Makefile 2014/06/14 03:25:15 1.201.2.9 +++ loncom/build/Makefile 2013/10/29 21:01:16 1.206 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.201.2.9 2014/06/14 03:25:15 raeburn Exp $ +# $Id: Makefile,v 1.206 2013/10/29 21:01:16 raeburn Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -26,9 +26,9 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=2.11.0 +VERSION=CVS_HEAD SHOWVERSION=$(VERSION) -NEXTVERSION=2.12 +NEXTVERSION=2.11 ifeq (CVS_HEAD,${VERSION}) SHOWVERSION=$(NEXTVERSION).$(VERSION) endif @@ -530,8 +530,8 @@ latex_fmtutil: lcmathcomplex: cat $(SOURCE)/doc/loncapafiles/lcmathcomplex.piml | \ - perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ - tee -a WARNINGS + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS removenolongerused: cat $(SOURCE)/doc/loncapafiles/removenolongerused.piml | \ @@ -566,9 +566,6 @@ postinstall: sed -i "s/\x08\x08*/.../g" WARNINGS VERSION: install -d $(TARGET)/etc - if (test -e /etc/loncapa-release); then \ - cp -p -v /etc/loncapa-release /etc/loncapa-release.prev; \ - fi echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release install -d $(TARGET)/home/httpd/html/lon-status