--- loncom/build/Makefile 2014/06/09 05:14:12 1.207 +++ loncom/build/Makefile 2024/07/28 19:40:59 1.226 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.207 2014/06/09 05:14:12 raeburn Exp $ +# $Id: Makefile,v 1.226 2024/07/28 19:40:59 raeburn Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -28,7 +28,7 @@ METAMTARGET="" MTARGET="" VERSION=CVS_HEAD SHOWVERSION=$(VERSION) -NEXTVERSION=2.11 +NEXTVERSION=2.12 ifeq (CVS_HEAD,${VERSION}) SHOWVERSION=$(NEXTVERSION).$(VERSION) endif @@ -56,12 +56,14 @@ 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, 8 or 9)," + @echo " scientificN (N = 5, 6 or 7), oracleN (N = 6, 7, 8 or 9), rockyN (N = 8 or 9)," + @echo " almaN (N = 8 or 9), centosN-stream (N = 8 or 9)," + @echo " or slesN (N = 9, 10, 11, 12 or 15), or debianN (N = 5, 6, 10, 11 or 12)," + @echo " or ubuntuN (N= 6, 8, 10, 12, 14, 16, 18, 20, 22 or 24), or fedoraN (N = 1 .. 40)," + @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" @@ -147,6 +149,8 @@ help_TARGETS: @echo "chkconfig: test runlevels of httpd and loncontrol." @echo "rpmcheck: test to see if rpms known to confict are installed." @echo "wrap_setuid: put a C wrapper around setuid scripts." + @echo "bash_config_check: test if enable-bracketed-paste set to on." + @echo "systemd_config_check: test if ProtectHome set to readonly." @echo "latex_fixup: regenerate ls-R database for the latex base." @echo "picins_check: check for picins.sty, retrieve and rebuild" @echo " filename databases used by LaTeX" @@ -274,10 +278,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 +297,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 @@ -530,13 +544,23 @@ 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 | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH) +bash_config_check: + cat $(SOURCE)/doc/loncapafiles/bash_config_check.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + +systemd_config_check: + cat $(SOURCE)/doc/loncapafiles/systemd_config_check.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + postinstall: make postaboutVERSION make webserverconf @@ -555,12 +579,13 @@ postinstall: make sanitycheck make logcleanup make sendmail_fix - make ownership_fix make wrap_setuid make latex_fixup make picins_check make mimetex_version_check make verify_domconfiguser + make bash_config_check + make systemd_config_check make latex_fmtutil make lcmathcomplex sed -i "s/\x08\x08*/.../g" WARNINGS