--- loncom/build/Makefile 2013/08/07 22:38:24 1.201.2.3 +++ loncom/build/Makefile 2013/07/22 22:17:58 1.202 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.201.2.3 2013/08/07 22:38:24 raeburn Exp $ +# $Id: Makefile,v 1.202 2013/07/22 22:17:58 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 @@ -58,7 +58,7 @@ help_OPTIONS: @echo "* ADJUSTABLE OPTIONS *" @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 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." @@ -153,8 +153,6 @@ 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 "updatequery: solicit the user for machine configuration" @echo " information; to be incorporated during an update" @echo " procedure (via the UPDATE command)" @@ -527,11 +525,6 @@ latex_fmtutil: 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)" $(LAUNCH) | \ - tee -a WARNINGS - postinstall: make postaboutVERSION make webserverconf @@ -557,7 +550,6 @@ postinstall: make mimetex_version_check make verify_domconfiguser make latex_fmtutil - make removenolongerused sed -i "s/\x08\x08*/.../g" WARNINGS VERSION: install -d $(TARGET)/etc