Module: ngircd.git Branch: master Commit: 4cf65b973c780880047b0ad4e77e95cf7315cb0f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4cf65...

Author: Alexander Barton alex@barton.de Date: Sat Aug 18 23:50:20 2012 +0200

"make uninstall": remove ngircd.conf if not modified

Now "make uninstall" removes the installed "ngircd.conf" file, if it is still equal to our "sample-ngircd.conf" file and therefore hasn't been modified by the user. If it has been modified, it isn't removed and a notice is displayed to the user.

In addition, "make install" now displays a message when no ngircd.conf file exists and the "sample-ngircd.conf" file will be installed as a starting point.

---

doc/Makefile.am | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am index 92e019b..3bf68fb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -52,8 +52,8 @@ all: $(generated_docs)

install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ - $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ + @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ + make install-config; \ fi $(mkinstalldirs) $(DESTDIR)$(docdir) for f in $(static_docs) $(toplevel_docs); do \ @@ -63,10 +63,30 @@ install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) $(INSTALL) -m 644 -c $$f $(DESTDIR)$(docdir)/; \ done

+install-config: + $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf + @echo; \ + echo " ** NOTE: Installed sample configuration file:"; \ + echo " ** "$(DESTDIR)$(sysconfdir)/ngircd.conf""; \ + echo + uninstall-hook: rm -rf $(DESTDIR)$(docdir) + @if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \ + make uninstall-config; \ + else \ + echo; \ + echo " ** NOTE: Not uninstalling changed configuration file:"; \ + echo " ** "$(DESTDIR)$(sysconfdir)/ngircd.conf""; \ + echo; \ + fi + +uninstall-config: + rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf

srcdoc: make -C src srcdoc

+.PHONY: install-config uninstall-config srcdoc + # -eof-