uninstall: Fix to remove everything installed under $(datadir)

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index c45e154a0e599ecd4b27b81e1ca32aa681572a98..a7bb327fcf08f6731f6baa0faa97e8cf2736e4c4 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -27,7 +27,7 @@
 #   Make.mk: The real Makefile, included by GNUmakefile
 #
 #   Known contributors to this file:
-#      Markus Armbruster, 2005-2012
+#      Markus Armbruster, 2005-2013
 #
 
 # This makefile was inspired by `Recursive Make Considered Harmful',
@@ -68,9 +68,10 @@ tarball := $(SHELL) -e $(scripts)/tarball
 econfig := $(sysconfdir)/empire/econfig
 schedule := $(sysconfdir)/empire/schedule
 gamedir := $(localstatedir)/empire
-builtindir := $(datadir)/empire/builtin
-einfodir := $(datadir)/empire/info.nr
-ehtmldir := $(datadir)/empire/info.html
+edatadir := $(datadir)/empire
+builtindir := $(edatadir)/builtin
+einfodir := $(edatadir)/info.nr
+ehtmldir := $(edatadir)/info.html
 client/w32 := arpa/inet.h netdb.h netinet/in.h sys/time.h sys/socket.h \
 sys/uio.h unistd.h w32io.c w32sockets.c w32types.h
 
@@ -201,6 +202,7 @@ install: all installdirs
        $(INSTALL_PROGRAM) $(util) $(server) $(sbindir)
        $(INSTALL_PROGRAM) $(client) $(bindir)
        $(INSTALL) -m 444 $(addprefix $(srcdir)/, $(builtins)) $(builtindir)
+       rm -f $(einfodir)/*
        $(INSTALL_DATA) $(info.nr) $(einfodir)
        $(INSTALL_DATA) $(addprefix $(srcdir)/, $(man6)) $(mandir)/man6
        sed -e '1,/^$$/d' -e 's/^/# /g' <$(srcdir)/doc/schedule >$(schedule).dist
@@ -232,13 +234,15 @@ installdirs:
 .PHONY: install-html
 install-html: html
        mkdir -p $(ehtmldir)
+       rm -f $(ehtmldir)/*
        $(INSTALL_DATA) $(info.html) $(ehtmldir)
 
 .PHONY: uninstall
 uninstall:
        rm -f $(addprefix $(sbindir)/, $(notdir $(util) $(server)))
        rm -f $(addprefix $(bindir)/, $(notdir $(client)))
-       rm -rf $(builtindir) $(einfodir)
+       rm -rf $(builtindir) $(einfodir) $(ehtmldir)
+       rmdir $(edatadir)
        rm -f $(addprefix $(mandir)/man6/, $(notdir $(man6)))
        @echo "$(dir $(econfig)) and $(gamedir) not removed, you may wish to remove it manually."
 
@@ -252,10 +256,11 @@ check: all
        $(srcdir)/tests/fairland-test $(srcdir)
 ifeq ($(empthread),LWP)
        $(srcdir)/tests/smoke-test $(srcdir)
+       $(srcdir)/tests/actofgod-test $(srcdir)
 else
        @echo "$(srcdir)/tests/smoke-test SKIPPED"
+       @echo "$(srcdir)/tests/actofgod-test SKIPPED"
 endif
-       $(srcdir)/tests/actofgod-test $(srcdir)
 
 
 ### Implicit rules