--- loncom/build/Makefile 2013/08/09 06:37:13 1.201.2.4 +++ loncom/build/Makefile 2015/03/16 09:58:15 1.201.2.11 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.201.2.4 2013/08/09 06:37:13 raeburn Exp $ +# $Id: Makefile,v 1.201.2.11 2015/03/16 09:58:15 raeburn Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -26,7 +26,7 @@ SAVE=program.pl.$(TIMESTAMP) LAUNCHSAVE=$(OUTSTREAM) $(SAVE) METAMTARGET="" MTARGET="" -VERSION=2.11.0.RC1 +VERSION=2.11.1 SHOWVERSION=$(VERSION) NEXTVERSION=2.12 ifeq (CVS_HEAD,${VERSION}) @@ -153,8 +153,9 @@ help_TARGETS: @echo "mimetex_version_check: check if mimetex.cgi version has changed," @echo " if so remove files from mimetexcache." @echo "latex_fmtutil: run utility to maintain TeX format files system-wide." - @echo "removenolongerused.piml: check if there are files from previous - @echo " LON-CAPA version; if so, prompt for removal." + @echo "lcmathcomplex: set nvsize in LCMathComplex, if different from default." + @echo "removenolongerused: check if there are files from previous + @echo " LON-CAPA version; if so, prompt for removal." @echo "updatequery: solicit the user for machine configuration" @echo " information; to be incorporated during an update" @echo " procedure (via the UPDATE command)" @@ -527,6 +528,11 @@ latex_fmtutil: perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ tee -a WARNINGS +lcmathcomplex: + cat $(SOURCE)/doc/loncapafiles/lcmathcomplex.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + removenolongerused: cat $(SOURCE)/doc/loncapafiles/removenolongerused.piml | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH) @@ -549,16 +555,19 @@ postinstall: make sanitycheck make logcleanup make sendmail_fix - make ownership_fix make wrap_setuid make latex_fixup make picins_check make mimetex_version_check make verify_domconfiguser make latex_fmtutil + make lcmathcomplex 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