From 958d9cff8d2b2fbcb1965904b971869e0875e878 Mon Sep 17 00:00:00 2001 From: psychon Date: Sun, 26 Jul 2009 15:04:59 +0000 Subject: [PATCH] Add "make uninstall" target (And some minor fixes to "make install") git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1580 726aef4b-f618-498e-8847-2d620e286838 --- Makefile.in | 27 +++++++++++++++++++++++---- man/Makefile.in | 6 ++++++ modules/Makefile.in | 7 +++++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 55ae3779..d11eb838 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,13 +80,32 @@ install: znc $(LIBZNC) install -m 0755 znc-buildmod $(DESTDIR)$(bindir) install -m 0644 $(srcdir)/*.h $(DESTDIR)$(includedir)/znc install -m 0644 znc.pc $(DESTDIR)$(PKGCONFIGDIR) - @if test -n "$(LIBZNC)"; then \ - mkdir -p $(DESTDIR)$(LIBZNCDIR) ; \ - install -m 0755 $(LIBZNC) $(DESTDIR)$(LIBZNCDIR) ; \ - fi @if test -n "@MODTARGET@"; then \ $(MAKE) -C modules install DESTDIR=$(DESTDIR); \ fi + if test -n "$(LIBZNC)"; then \ + mkdir -p $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \ + install -m 0755 $(LIBZNC) $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \ + fi @$(MAKE) -C man install DESTDIR=$(DESTDIR) +uninstall: + rm $(DESTDIR)$(bindir)/znc + rm $(DESTDIR)$(bindir)/znc-config + rm $(DESTDIR)$(bindir)/znc-buildmod + rm $(DESTDIR)$(includedir)/znc/*.h + rm $(DESTDIR)$(PKGCONFIGDIR)/znc.pc + if test -n "$(LIBZNC)"; then \ + rm $(LIBZNC) $(DESTDIR)$(LIBZNCDIR)/$(LIBZNC) || exit 1 ; \ + rmdir $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \ + fi + @$(MAKE) -C man uninstall DESTDIR=$(DESTDIR) + @if test -n "modules"; then \ + $(MAKE) -C modules uninstall DESTDIR=$(DESTDIR); \ + fi + rmdir $(DESTDIR)$(bindir) + rmdir $(DESTDIR)$(includedir)/znc + rmdir $(DESTDIR)$(PKGCONFIGDIR) + @echo "Successfully uninstalled, but emptry directories were left behind" + -include $(wildcard .depend/*.dep) diff --git a/man/Makefile.in b/man/Makefile.in index 5d95595c..a619cd59 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -19,3 +19,9 @@ clean: install: $(MAN1) mkdir -p $(DESTDIR)$(mandir)/man1 install -m 644 $(MAN1) $(DESTDIR)$(mandir)/man1 + +uninstall: + for file in $(MAN1) ; do \ + rm $(DESTDIR)$(mandir)/man1/$$file || exit 1 ; \ + done + rmdir $(DESTDIR)$(mandir)/man1 diff --git a/modules/Makefile.in b/modules/Makefile.in index 66d1b648..2ddbb506 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -92,4 +92,11 @@ modperl_install: create_install_dir install -m 0644 $$i $(DESTDIR)$(MODDIR); \ done +uninstall: + # Yes, we are lazy, just remove everything in there + rm -rf $(DESTDIR)$(MODDIR)/* + rm -rf $(DESTDIR)$(DATADIR)/* + rmdir $(DESTDIR)$(MODDIR) + rmdir $(DESTDIR)$(DATADIR) + -include $(wildcard .depend/*.dep)