--- loncom/build/Makefile 2012/02/08 02:19:12 1.190.8.7.2.2 +++ loncom/build/Makefile 2014/02/18 02:36:43 1.201.2.7 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.190.8.7.2.2 2012/02/08 02:19:12 raeburn Exp $ +# $Id: Makefile,v 1.201.2.7 2014/02/18 02:36:43 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.10.1-MITr.1 +VERSION=2.11.0.RC3 SHOWVERSION=$(VERSION) -NEXTVERSION=2.11 +NEXTVERSION=2.12 ifeq (CVS_HEAD,${VERSION}) SHOWVERSION=$(NEXTVERSION).$(VERSION) endif @@ -56,9 +56,12 @@ help: help_OPTIONS: @echo "* ADJUSTABLE OPTIONS *" - @echo "(option) DIST can be redhat7, debian, redhat6.2, or default" - @echo " You probably do not need to specify this; it is" - @echo " automatically probed for." + @echo "(option) DIST can be centosN (N = 5 or 6), rhesN (N = 4, 5 or 6)," + @echo " or scientificN (N = 4 or 5), or slesN (N = 9,10 or 11)," + @echo " or ubuntuN (N= 6, 8, 10 or 12), or fedoraN (N = 1 .. 19)," + @echo " or suseN.M (N.M: 9.2 ... 12.3), or debianN (N = 5 or 6)," + @echo " or default. It is unlikely you would ever need to specify" + @echo " this, as it is automatically probed for." @echo "(option) CATEGORY can be 'runtime' or 'development'; currently" @echo " the 'development' setting is the most reliable;" @echo " eventually, production machines should be using the" @@ -150,6 +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 "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)" @@ -522,6 +528,15 @@ 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) + postinstall: make postaboutVERSION make webserverconf @@ -531,7 +546,7 @@ postinstall: make update_queue_slots make modify_config_files make clearoutoldspreadsheetcache - make langcheck + make langcheck make chkconfig make rpmcheck make ntpcheck @@ -547,6 +562,7 @@ postinstall: make mimetex_version_check make verify_domconfiguser make latex_fmtutil + make lcmathcomplex sed -i "s/\x08\x08*/.../g" WARNINGS VERSION: install -d $(TARGET)/etc