--- loncom/build/Makefile 2024/07/28 20:05:23 1.201.2.27 +++ 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.27 2024/07/28 20:05:23 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.5 +VERSION=CVS_HEAD SHOWVERSION=$(VERSION) NEXTVERSION=2.12 ifeq (CVS_HEAD,${VERSION}) @@ -56,14 +56,12 @@ help: help_OPTIONS: @echo "* ADJUSTABLE OPTIONS *" - @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) 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 .. 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" @echo " the 'development' setting is the most reliable;" @echo " eventually, production machines should be using the" @@ -149,8 +147,6 @@ 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" @@ -544,23 +540,13 @@ 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 @@ -584,8 +570,6 @@ postinstall: 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