--- loncom/build/Makefile 2019/02/16 18:21:59 1.201.2.16 +++ loncom/build/Makefile 2019/06/09 03:10:16 1.214 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.201.2.16 2019/02/16 18:21:59 raeburn Exp $ +# $Id: Makefile,v 1.214 2019/06/09 03:10:16 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.3 +VERSION=CVS_HEAD SHOWVERSION=$(VERSION) NEXTVERSION=2.12 ifeq (CVS_HEAD,${VERSION}) @@ -56,10 +56,10 @@ help: help_OPTIONS: @echo "* ADJUSTABLE OPTIONS *" - @echo "(option) DIST can be centosN (N = 5, 6 or 7), rhesN (N = 4, 5, 6 or 7)," + @echo "(option) DIST can be centosN (N = 5, 6 or 7), rhesN (N = 4, 5, 6, 7 or 8)," @echo " or scientificN (N = 5, 6 or 7), or slesN (N = 9, 10, 11, 12 or 15)," - @echo " or ubuntuN (N= 6, 8, 10, 12, 14, 16 or 18), or fedoraN (N = 1 .. 29)," - @echo " or suseN.M (N.M: 9.2 ... 13.2), or debianN (N = 5 or 6)," + @echo " or ubuntuN (N= 6, 8, 10, 12, 14, 16 or 18), or fedoraN (N = 1 .. 30)," + @echo " or suseN.M (N.M: 9.2 .. 13.2), 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" @@ -540,8 +540,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 | \