summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeville Cain <neville.cain@qonto.eu>2019-12-28 02:26:38 +0100
committerNeville Cain <neville.cain@qonto.eu>2019-12-28 02:26:38 +0100
commit644132419219404edecbdc62ab4abd9a6f2344c6 (patch)
treebc74766637e5570eb5511695d036772237bd64e6
parentc759c3f78dcbbf5dec462a863ad25cd41a1707b7 (diff)
downloadpodman-644132419219404edecbdc62ab4abd9a6f2344c6.tar.gz
podman-644132419219404edecbdc62ab4abd9a6f2344c6.tar.bz2
podman-644132419219404edecbdc62ab4abd9a6f2344c6.zip
Ensure 'make uninstall' remove bin and conf files.
I updated the 'make uninstall' command to remove: 1. podman and remote bin 2. cni/net.d/87-podman-bridge.conflist 3. podman.conf 4. systemd conf files: io.podman.socket.* Closes #4572 Signed-off-by: Neville Cain <neville.cain@qonto.eu>
-rw-r--r--Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index fb6e48585..32da41ef7 100644
--- a/Makefile
+++ b/Makefile
@@ -447,12 +447,22 @@ install.systemd:
install ${SELINUXOPT} -m 644 contrib/varlink/podman.conf ${DESTDIR}${TMPFILESDIR}/podman.conf
uninstall:
+ # Remove manpages
for i in $(filter %.1,$(MANPAGES_DEST)); do \
rm -f $(DESTDIR)$(MANDIR)/man1/$$(basename $${i}); \
done; \
for i in $(filter %.5,$(MANPAGES_DEST)); do \
rm -f $(DESTDIR)$(MANDIR)/man5/$$(basename $${i}); \
done
+ # Remove podman and remote bin
+ rm -f $(DESTDIR)$(BINDIR)/podman
+ rm -f $(DESTDIR)$(BINDIR)/podman-remote
+ # Remove related config files
+ rm -f ${DESTDIR}${ETCDIR}/cni/net.d/87-podman-bridge.conflist
+ rm -f ${DESTDIR}${TMPFILESDIR}/podman.conf
+ rm -f ${DESTDIR}${SYSTEMDDIR}/io.podman.socket
+ rm -f ${DESTDIR}${USERSYSTEMDDIR}/io.podman.socket
+ rm -f ${DESTDIR}${SYSTEMDDIR}/io.podman.service
.PHONY: .gitvalidation
.gitvalidation: .gopathok