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

[empserver] / Make.mk

diff --git a/Make.mk b/Make.mk
index 81048888fe4ed5e9f89f92874c352aa7ebdd6420..a7bb327fcf08f6731f6baa0faa97e8cf2736e4c4 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -68,9 +68,10 @@ tarball := $(SHELL) -e $(scripts)/tarball
 econfig := $(sysconfdir)/empire/econfig
 schedule := $(sysconfdir)/empire/schedule
 gamedir := $(localstatedir)/empire
 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
 
 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
 


@@ -240,7 +241,8 @@ install-html: html
 uninstall:
        rm -f $(addprefix $(sbindir)/, $(notdir $(util) $(server)))
        rm -f $(addprefix $(bindir)/, $(notdir $(client)))
 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."
 
        rm -f $(addprefix $(mandir)/man6/, $(notdir $(man6)))
        @echo "$(dir $(econfig)) and $(gamedir) not removed, you may wish to remove it manually."