From 29d239a3689fda781b969ceb9f7c6ba9645ebcd9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 14 Jun 2016 21:21:09 +0200 Subject: Merging upstream version 20160615. Signed-off-by: Daniel Baumann --- Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0deb81e..d22c32c 100644 --- a/Makefile +++ b/Makefile @@ -53,8 +53,8 @@ build: share/man/*.txt $(MAKE) -C share/man install: build - mkdir -p $(DESTDIR)/etc/container-tools/config - mkdir -p $(DESTDIR)/etc/container-tools/debconf + mkdir -p $(DESTDIR)/etc/${SOFTWARE}/config + mkdir -p $(DESTDIR)/etc/${SOFTWARE}/debconf mkdir -p $(DESTDIR)/usr/bin cp -r bin/* $(DESTDIR)/usr/bin @@ -65,6 +65,9 @@ install: build mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE) cp -r VERSION.txt share/config share/scripts ${DESTDIR}/usr/share/$(SOFTWARE) + mkdir -p $(DESTDIR)/usr/share/bash-completion/completions + cp -r share/bash-completion/* $(DESTDIR)/usr/share/bash-completion/completions + mkdir -p $(DESTDIR)/usr/share/doc/$(SOFTWARE) cp -r share/doc $(DESTDIR)/usr/share/doc/$(SOFTWARE) @@ -118,6 +121,11 @@ uninstall: rm -f $(DESTDIR)/usr/bin/cntsh rm -f $(DESTDIR)/usr/share/man/man1/cntsh.1 + for FILE in share/bash-completion/*; \ + do \ + rm -f $(DESTDIR)/usr/share/bash-completion/completions/$$(basename $${FILE}); \ + done + rm -rf $(DESTDIR)/usr/share/doc/$(SOFTWARE) rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/doc || true @@ -133,8 +141,12 @@ uninstall: done rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/bin || true - rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/container-tools/config || true - rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/container-tools/debconf || true + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE}/config || true + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE}/debconf || true + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/${SOFTWARE} || true + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc || true + + rmdir --ignore-fail-on-non-empty --parents $(DESTDIR) || true clean: $(MAKE) -C share/man clean -- cgit v1.2.3