--- loncom/build/Makefile 2024/07/09 02:02:41 1.201.2.26 +++ loncom/build/Makefile 2024/08/25 18:58:40 1.201.2.29.2.1 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.201.2.26 2024/07/09 02:02:41 raeburn Exp $ +# $Id: Makefile,v 1.201.2.29.2.1 2024/08/25 18:58:40 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=2.11.5.B SHOWVERSION=$(VERSION) NEXTVERSION=2.12 ifeq (CVS_HEAD,${VERSION}) @@ -150,6 +150,7 @@ help_TARGETS: @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" @@ -372,9 +373,11 @@ hosts_and_domain_tab: TEST_hosts_tab TES "$(TARGET)" > Makefile.install make -f Makefile.install directories make -f Makefile.install files - @echo "If hosts.tab or domain.tab has changed, restart httpd and loncontrol:" - @echo " /etc/rc.d/init.d/httpd restart" - @echo " /etc/rc.d/init.d/loncontrol restart" + @echo "If hosts.tab or domain.tab has changed, restart the web server and loncontrol:" + @echo " service httpd restart, or if that is unavailable on your Linux distro:" + @echo " service apache2 restart" + @echo " /home/httpd/perl/loncontrol restart, or if that is unavailable on your Linux distro:" + @echo " /etc/init.d/loncontrol restart" webserverconf: cat $(SOURCE)/doc/loncapafiles/webserver.piml | \ @@ -555,6 +558,11 @@ bash_config_check: 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 @@ -579,6 +587,7 @@ postinstall: 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 @@ -659,7 +668,7 @@ Makefile.build: $(SOURCE)/doc/loncapafil Makefile.install: alwaysrun cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \ - "$(TARGET)" > Makefile.install + "$(TARGET)" "$(CURRSHELL)" > Makefile.install # ============= *** TARGETS FOR OPERATING ON FILESYSTEMS ACROSS THE NETWORK ***