--- loncom/build/Makefile 2016/08/09 17:04:34 1.201.2.13 +++ loncom/build/Makefile 2021/12/21 13:57:47 1.223 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.201.2.13 2016/08/09 17:04:34 raeburn Exp $ +# $Id: Makefile,v 1.223 2021/12/21 13:57:47 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.2 +VERSION=CVS_HEAD SHOWVERSION=$(VERSION) NEXTVERSION=2.12 ifeq (CVS_HEAD,${VERSION}) @@ -56,12 +56,14 @@ 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 " or scientificN (N = 5, 6 or 7), or slesN (N = 9, 10, 11 or 12)," - @echo " or ubuntuN (N= 6, 8, 10, 12 or 14), or fedoraN (N = 1 .. 24)," - @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) DIST can be centosN (N = 5, 6, 7 or 8), rhesN (N = 4, 5, 6, 7 or 8)," + @echo " scientificN (N = 5, 6 or 7), oracleN (N = 6, 7 or 8), rockyN (N = 8)," + @echo " almaN (N = 8), centosN-stream (N = 8 or 9)," + @echo " or slesN (N = 9, 10, 11, 12 or 15), or debianN (N = 5 or 6)," + @echo " or ubuntuN (N= 6, 8, 10, 12, 14, 16, 18 or 20), or fedoraN (N = 1 .. 35)," + @echo " or suseN.M (N.M: 9.2 .. 13.2), or default." + @echo " It is unlikely you would ever need to specify this," + @echo " 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" @@ -282,7 +284,7 @@ TEST_hosts_tab: echo "CVS repository (cd loncapa/loncom)" && \ echo " 1) ln -s production_dns_hosts.tab dns_hosts.tab" && \ echo " 2) ln -s development_dns_hosts.tab dns_hosts.tab" && \ - echo "(you most likely want option #1, production_dns_hosts.tab)" && \ + echo "(you most likely want option #1, production_dns_hosts.tab)" && \ exit 1; \ fi