--- loncom/build/Makefile 2013/11/20 02:10:04 1.201.2.5 +++ loncom/build/Makefile 2021/12/20 03:13:29 1.222 @@ -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.222 2021/12/20 03:13:29 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.0.RC1 +VERSION=CVS_HEAD SHOWVERSION=$(VERSION) NEXTVERSION=2.12 ifeq (CVS_HEAD,${VERSION}) @@ -56,12 +56,13 @@ help: 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 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) 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) 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" @@ -274,10 +275,15 @@ TEST_hosts_tab: else echo "**** ERROR **** hosts.tab not defined!" && \ echo -n "You need to do one of the following within your " && \ 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 " 1) ln -s production_hosts.tab hosts.tab" && \ + echo " 2) ln -s development_hosts.tab hosts.tab" && \ echo "or 3) ln -s rawhide_hosts.tab hosts.tab" && \ echo "(you most likely want option #1, production_hosts.tab)" && \ + echo " and also one of the following within your " && \ + 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)" && \ exit 1; \ fi @@ -288,10 +294,15 @@ TEST_domain_tab: else echo "**** ERROR **** domain.tab not defined!" && \ echo -n "You need to do one of the following within your " && \ echo "CVS repository (cd loncapa/loncom)" && \ - echo " 1) ln -s production_dns_domain.tab dns_domain.tab" && \ - echo " 2) ln -s development_dns_domain.tab dns_domain.tab" && \ + echo " 1) ln -s production_domain.tab domain.tab" && \ + echo " 2) ln -s development_domain.tab domain.tab" && \ echo "or 3) ln -s rawhide_domain.tab domain.tab" && \ echo "(you most likely want option #1, production_domain.tab)" && \ + echo " and also one of the following within your " && \ + echo "CVS repository (cd loncapa/loncom)" && \ + echo " 1) ln -s production_dns_domain.tab dns_domain.tab" && \ + echo " 2) ln -s development_dns_domain.tab dns_domain.tab" && \ + echo "(you most likely want option #1, production_dns_domain.tab)" && \ exit 1; \ fi @@ -555,7 +566,6 @@ postinstall: make sanitycheck make logcleanup make sendmail_fix - make ownership_fix make wrap_setuid make latex_fixup make picins_check @@ -566,6 +576,9 @@ postinstall: sed -i "s/\x08\x08*/.../g" WARNINGS VERSION: install -d $(TARGET)/etc + if (test -e /etc/loncapa-release); then \ + cp -p -v /etc/loncapa-release /etc/loncapa-release.prev; \ + fi echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release install -d $(TARGET)/home/httpd/html/lon-status