diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-08 13:08:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-08 13:08:27 +0200 |
| commit | 31bfb12aec6123bd97e84b2067096b09676ca6ac (patch) | |
| tree | 27a941e341074fee753d818a974c0fadf66bab88 | |
| parent | 41de7b14e0c69be15a7f19c69d5bfb374be62466 (diff) | |
| parent | 096af85278967421533ffa9975078eccd57b5b5d (diff) | |
| download | podman-31bfb12aec6123bd97e84b2067096b09676ca6ac.tar.gz podman-31bfb12aec6123bd97e84b2067096b09676ca6ac.tar.bz2 podman-31bfb12aec6123bd97e84b2067096b09676ca6ac.zip | |
Merge pull request #3757 from lsm5/makeinstall
add make to make installs
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -333,12 +333,12 @@ changelog: ## Generate changelog install: .gopathok install.bin install.remote install.man install.cni install.systemd ## Install binaries to system locations -install.remote: +install.remote: podman-remote install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) install ${SELINUXOPT} -m 755 bin/podman-remote $(DESTDIR)$(BINDIR)/podman-remote test -z "${SELINUXOPT}" || chcon --verbose --reference=$(DESTDIR)$(BINDIR)/podman bin/podman-remote -install.bin: +install.bin: podman install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) install ${SELINUXOPT} -m 755 bin/podman $(DESTDIR)$(BINDIR)/podman test -z "${SELINUXOPT}" || chcon --verbose --reference=$(DESTDIR)$(BINDIR)/podman bin/podman diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 9d8467783..7e361d757 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -354,9 +354,13 @@ providing packages with %{import_path} prefix. %prep %autosetup -Sgit -n %{repo}-%{shortcommit0} -# untar cri-o +# untar conmon tar zxf %{SOURCE1} +sed -i 's/install.remote: podman-remote/install.remote:/' Makefile +sed -i 's/install.bin: podman/install.bin:/' Makefile +sed -i 's/install.man: docs/install.man:/' Makefile + %build mkdir _build pushd _build |