diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-28 17:28:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 17:28:57 +0200 |
| commit | 5077aece7e7c7531f002116ffce33c0cf0d03ec3 (patch) | |
| tree | 97790ccbb67dde4c3083c5b6f0213f96caffd2b2 /contrib/spec | |
| parent | e9a1726f50565d633edf87a88ca6960ea075d50f (diff) | |
| parent | c10bd7c11f62643ef75e766d254b0bc6828f688e (diff) | |
| download | podman-5077aece7e7c7531f002116ffce33c0cf0d03ec3.tar.gz podman-5077aece7e7c7531f002116ffce33c0cf0d03ec3.tar.bz2 podman-5077aece7e7c7531f002116ffce33c0cf0d03ec3.zip | |
Merge pull request #5954 from lsm5/usable-Makefile-for-packaging
Makefile: install targets should not depend on build targets
Diffstat (limited to 'contrib/spec')
| -rw-r--r-- | contrib/spec/podman.spec.in | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index afc50f854..1dfbdf208 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -377,12 +377,6 @@ Man pages for the %{name} commands # untar conmon tar zxf %{SOURCE1} -sed -i 's/install.remote: podman-remote/install.remote:/' Makefile -sed -i 's/install.bin: podman/install.bin:/' Makefile -%if %{with doc} -sed -i 's/install.man: docs/install.man:/' Makefile -%endif - %build mkdir _build pushd _build @@ -417,22 +411,15 @@ popd %install install -dp %{buildroot}%{_unitdir} install -dp %{buildroot}%{_usr}/lib/systemd/user -%if %{with doc} -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ - install.bin \ - install.remote \ - install.man \ - install.cni \ - install.systemd \ - install.completions -%else PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \ - install.bin \ - install.remote \ + install.bin-nobuild \ + install.remote-nobuild \ +%if %{with doc} + install.man-nobuild \ +%endif install.cni \ install.systemd \ install.completions -%endif mv pkg/hooks/README.md pkg/hooks/README-hooks.md |