diff options
| author | Jhon Honce <jhonce@redhat.com> | 2018-09-17 14:32:02 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-18 12:36:15 +0000 |
| commit | 1fb8d7f248f9678ca9d5d39232ef3df23ab226d6 (patch) | |
| tree | b8769eb4ed0e89b568c378318909ed8f6839030e | |
| parent | 0b2cfa7fcf479a26245ade0490fdfbecc973d9bb (diff) | |
| download | podman-1fb8d7f248f9678ca9d5d39232ef3df23ab226d6.tar.gz podman-1fb8d7f248f9678ca9d5d39232ef3df23ab226d6.tar.bz2 podman-1fb8d7f248f9678ca9d5d39232ef3df23ab226d6.zip | |
Replace all usages of "install -D" with "install -d"
Fixes #1481
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Closes: #1496
Approved by: rhatdan
| -rw-r--r-- | Makefile | 26 |
1 files changed, 15 insertions, 11 deletions
@@ -213,7 +213,8 @@ changelog: install: .gopathok install.bin install.man install.cni install.systemd install.python install.bin: - install ${SELINUXOPT} -D -m 755 bin/podman $(BINDIR)/podman + install ${SELINUXOPT} -d -m 755 $(BINDIR) + install ${SELINUXOPT} -m 755 bin/podman $(BINDIR)/podman install.man: docs install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1 @@ -223,26 +224,29 @@ install.man: docs install ${SELINUXOPT} -m 644 docs/links/*1 -t $(MANDIR)/man1 install.config: - install ${SELINUXOPT} -D -m 644 libpod.conf ${SHAREDIR_CONTAINERS}/libpod.conf - install ${SELINUXOPT} -D -m 644 seccomp.json $(ETCDIR_LIBPOD)/seccomp.json - install ${SELINUXOPT} -D -m 644 crio-umount.conf $(OCIUMOUNTINSTALLDIR)/crio-umount.conf + install ${SELINUXOPT} -d -m 755 $(SHAREDIR_CONTAINERS) $(ETCDIR_LIBPOD) $(OCIUMOUNTINSTALLDIR) + install ${SELINUXOPT} -m 644 libpod.conf $(SHAREDIR_CONTAINERS)/libpod.conf + install ${SELINUXOPT} -m 644 seccomp.json $(ETCDIR_LIBPOD)/seccomp.json + install ${SELINUXOPT} -m 644 crio-umount.conf $(OCIUMOUNTINSTALLDIR)/crio-umount.conf install.completions: install ${SELINUXOPT} -d -m 755 ${BASHINSTALLDIR} - install ${SELINUXOPT} -m 644 -D completions/bash/podman ${BASHINSTALLDIR} + install ${SELINUXOPT} -m 644 completions/bash/podman ${BASHINSTALLDIR} install.cni: - install ${SELINUXOPT} -D -m 644 cni/87-podman-bridge.conflist ${ETCDIR}/cni/net.d/87-podman-bridge.conflist + install ${SELINUXOPT} -d -m 755 ${ETCDIR}/cni/net.d/ + install ${SELINUXOPT} -m 644 cni/87-podman-bridge.conflist ${ETCDIR}/cni/net.d/87-podman-bridge.conflist install.docker: docker-docs - install ${SELINUXOPT} -D -m 755 docker $(BINDIR)/docker - install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1 + install ${SELINUXOPT} -d -m 755 $(BINDIR) $(MANDIR)/man1 + install ${SELINUXOPT} -m 755 docker $(BINDIR)/docker install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(MANDIR)/man1 install.systemd: - install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.socket ${SYSTEMDDIR}/io.podman.socket - install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.service ${SYSTEMDDIR}/io.podman.service - install ${SELINUXOPT} -m 644 -D contrib/varlink/podman.conf ${TMPFILESDIR}/podman.conf + install ${SELINUXOPT} -m 755 -d ${SYSTEMDDIR} ${TMPFILESDIR} + install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.socket ${SYSTEMDDIR}/io.podman.socket + install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.service ${SYSTEMDDIR}/io.podman.service + install ${SELINUXOPT} -m 644 contrib/varlink/podman.conf ${TMPFILESDIR}/podman.conf install.python: $(MAKE) DESTDIR=${DESTDIR} -C contrib/python/podman install |