--- loncom/build/Makefile 2013/11/20 02:10:04 1.201.2.5 +++ loncom/build/Makefile 2013/08/09 06:24:32 1.205 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.201.2.5 2013/11/20 02:10:04 raeburn Exp $ +# $Id: Makefile,v 1.205 2013/08/09 06:24:32 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.RC1 +VERSION=CVS_HEAD SHOWVERSION=$(VERSION) -NEXTVERSION=2.12 +NEXTVERSION=2.11 ifeq (CVS_HEAD,${VERSION}) SHOWVERSION=$(NEXTVERSION).$(VERSION) endif @@ -153,9 +153,8 @@ 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 "removenolongerused.piml: 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)" @@ -528,11 +527,6 @@ 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) @@ -562,7 +556,6 @@ 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