diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-12-28 20:39:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-28 20:39:58 +0100 |
| commit | 6897a1f5c2b9f4b5e897b5461e632d6f6ab128c6 (patch) | |
| tree | 19ad52673744c14b98bab58e696b3fa77d4b518d | |
| parent | 24b4921508be011b8fc4707d262116f77c8a176b (diff) | |
| parent | 644132419219404edecbdc62ab4abd9a6f2344c6 (diff) | |
| download | podman-6897a1f5c2b9f4b5e897b5461e632d6f6ab128c6.tar.gz podman-6897a1f5c2b9f4b5e897b5461e632d6f6ab128c6.tar.bz2 podman-6897a1f5c2b9f4b5e897b5461e632d6f6ab128c6.zip | |
Merge pull request #4754 from NevilleC/nc-improvemakeuninstall
Ensure 'make uninstall' removes bin and conf files.
| -rw-r--r-- | Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -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 |