build system: remove directories if possible in uninstall target

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/Makefile b/Makefile
index 8e59289b8a7bd1c3033baaabff3913c5a2a20cc3..ac11fd67d22ea47a99b5546bb072d98f2505e29d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -93,6 +93,12 @@ uninstall:
        $(MAKE) -C local uninstall
        $(MAKE) -C extensions uninstall
        rm -f $(DESTDIR)$(LIBDIR)/buildconfig.lua
+       rmdir -p $(DESTDIR)$(TOOLDIR) >/dev/null 2>&1 || :
+       rmdir -p $(DESTDIR)$(MANDIR) >/dev/null 2>&1 || :
+       rmdir -p $(DESTDIR)$(INCDIR) >/dev/null 2>&1 || :
+       rmdir -p $(DESTDIR)$(LIBEXECDIR) >/dev/null 2>&1 || :
+       rmdir -p $(DESTDIR)$(LIBDIR) >/dev/null 2>&1 || :
+       rmdir -p $(DESTDIR)$(BINDIR) >/dev/null 2>&1 || :
 
 local: e2commit buildconfig.lua
        $(MAKE) -C generic local

diff --git a/doc/man/Makefile b/doc/man/Makefile
index 306417367585051d6ac230ca80eb724966d0d947..a38f7a1a7642a2df5a0dc91f8a03501a50b77999 100644 (file)
--- a/doc/man/Makefile
+++ b/doc/man/Makefile
@@ -69,6 +69,9 @@ uninstall:
        for x in $(MANPAGES1) ; do rm -f $(DESTDIR)$(MANDIR)/man1/$$x ; done
        for x in $(MANPAGES5) ; do rm -f $(DESTDIR)$(MANDIR)/man5/$$x ; done
        for x in $(MANPAGES7) ; do rm -f $(DESTDIR)$(MANDIR)/man7/$$x ; done
+       rmdir $(DESTDIR)$(MANDIR)/man1 || :
+       rmdir $(DESTDIR)$(MANDIR)/man5 || :
+       rmdir $(DESTDIR)$(MANDIR)/man7 || :
 
 doc: man.tar.gz
        for s in $(SUBDIRS) ; do \

diff --git a/lua/Makefile b/lua/Makefile
index 61d45895af1923fd4b1307ba4e79ed083c2edc7c..0710cce3af708ff3eed0144222bd5c5908a307f7 100644 (file)
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -60,6 +60,7 @@ uninstall:
        for x in $(LUA_HEADER) ; do \
                rm -f $(DESTDIR)$(INCDIR)/lua-5.1.3/$$x ; \
        done
+       rmdir -p $(DESTDIR)$(INCDIR)/lua-5.1.3 || :
 
 doc:
        for s in $(SUBDIRS) ; do \