From 904039417fe29a55513c8f17bf8d8c034088291e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 7 Apr 2017 14:14:18 +0200 Subject: Adding upstream version 20170405. Signed-off-by: Daniel Baumann --- Makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 13144ac..b5a3a47 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Makefile # apache-icons - Alternative icons for Apache autoindex -# Copyright (C) 2014-2016 Daniel Baumann +# Copyright (C) 2014-2017 Daniel Baumann # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -83,14 +83,23 @@ uninstall: do \ for FILE in share/man/*.$${SECTION}; \ do \ - if [ -e "$${FILE}" ]; \ - then \ - rm -f $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${FILE}); \ - fi; \ + rm -f $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${FILE}); \ done; \ rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/man/man$${SECTION} || true; \ done + for FILE in share/apache/conf/*; \ + do \ + rm -f $(DESTDIR)/etc/apache2/conf-available/$$(basename $${FILE}); \ + done + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/apache2/conf-available || true + + for FILE in share/apache/mods/*; \ + do \ + rm -f $(DESTDIR)/etc/apache2/mods-available/$$(basename $${FILE}); \ + done + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/apache2/mods-available || true + rm -rf $(DESTDIR)/usr/share/$(SOFTWARE)/* rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/$(SOFTWARE) || true -- cgit v1.2.3