diff --git a/INSTALL b/INSTALL index 7ca4d68..0a90e12 100644 --- a/INSTALL +++ b/INSTALL @@ -47,12 +47,16 @@ make your access lists. Running with traditional inetd superserver ========================================== -If you want to run Gophernicus under the traditional Unix -inetd, add the below line to your /etc/inetd.conf and restart -the inetd process. +If you want to run Gophernicus under the traditional Unix inetd, the +below line shoudl be added to your /etc/inetd.conf and the inetd +process restarted. gopher stream tcp nowait nobody /usr/sbin/in.gophernicus in.gophernicus -h +The Makefile will automatically do this for you if you have the +update(1) script installed, which is the usual case in most current +flavors of Linux and BSD. + Compiling on Debian Linux (and Ubuntu) ====================================== diff --git a/Makefile b/Makefile index dfa1722..44735f9 100644 --- a/Makefile +++ b/Makefile @@ -188,18 +188,7 @@ install-root: @echo install-inetd: install-files install-docs install-root - @echo - @echo "======================================================================" - @echo - @echo "Looks like your system has the traditional internet superserver inetd." - @echo "Automatic installations aren't supported, so please add the following" - @echo "line to the end of your /etc/inetd.conf and restart or kill -HUP the" - @echo "inetd process." - @echo - @echo "gopher stream tcp nowait nobody $(SBINDIR)/$(BINARY) $(BINARY) -h `hostname`" - @echo - @echo "======================================================================" - @echo + update-inetd --add "gopher stream tcp nowait nobody $(SBINDIR)/$(BINARY) $(BINARY) -h `hostname`" install-xinetd: install-files install-docs install-root if [ -d "$(XINETD)" -a ! -f "$(XINETD)/$(NAME)" ]; then \ @@ -265,14 +254,9 @@ uninstall: uninstall-xinetd uninstall-launchd uninstall-systemd @echo uninstall-inetd: - if ( -f "$(INETD)" ]; then \ - @echo "Please manually delete following line and restart or" - @echo "kill -HUP the inetd process." - @echo - @echo " - @echo "gopher stream tcp nowait nobody $(SBINDIR)/$(BINARY) $(BINARY) -h `hostname`" + if [ -f "$(INETD)" ]; then \ + update-inetd --remove "^gopher.*gophernicus" fi - @echo uninstall-xinetd: if grep -q $(BINARY) "$(XINETD)/gopher" 2>/dev/null; then \