From 78d28c90ada672e80cf0abe7e8ed6468d6f307e2 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 26 Dec 2013 18:30:50 +0100 Subject: [PATCH] uninstall: Fix to remove everything installed under $(datadir) Info pages in $(datadir)/empire/info.html/ and the directory $(datadir)/empire/ aren't removed. Fix that. Signed-off-by: Markus Armbruster --- Make.mk | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Make.mk b/Make.mk index 81048888f..a7bb327fc 100644 --- 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 -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 @@ -240,7 +241,8 @@ install-html: html 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." -- 2.43.0