mirror of
https://github.com/containers/podman
synced 2024-10-20 01:03:51 +00:00
Makefile: include -nobuild install targets
Distro packaging often uses non-default build and linker flags. The current Makefile cannot be used in the package build process as it will end up rebuilding the binaries with the default flags. This commit introduces install targets which do not depend on the build targets. Distro packages should prefer these if they want to use any non-default flags. NOTE: This commit effectively leaves prior targets unchanged, so users won't notice any difference. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
parent
e25528633d
commit
c10bd7c11f
20
Makefile
20
Makefile
|
@ -470,25 +470,35 @@ changelog: ## Generate changelog
|
|||
.PHONY: install
|
||||
install: .gopathok install.bin install.remote install.man install.cni install.systemd ## Install binaries to system locations
|
||||
|
||||
.PHONY: install.remote
|
||||
install.remote: podman-remote
|
||||
.PHONY: install.remote-nobuild
|
||||
install.remote-nobuild:
|
||||
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-remote bin/podman-remote
|
||||
|
||||
.PHONY: install.bin
|
||||
install.bin: podman
|
||||
.PHONY: install.remote
|
||||
install.remote: podman-remote install.remote-nobuild
|
||||
|
||||
.PHONY: install.bin-nobuild
|
||||
install.bin-nobuild:
|
||||
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
|
||||
|
||||
install.man: docs
|
||||
.PHONY: install.bin
|
||||
install.bin: podman install.bin-nobuild
|
||||
|
||||
.PHONY: install.man-nobuild
|
||||
install.man-nobuild:
|
||||
install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(MANDIR)/man1
|
||||
install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(MANDIR)/man5
|
||||
install ${SELINUXOPT} -m 644 $(filter %.1,$(MANPAGES_DEST)) -t $(DESTDIR)$(MANDIR)/man1
|
||||
install ${SELINUXOPT} -m 644 $(filter %.5,$(MANPAGES_DEST)) -t $(DESTDIR)$(MANDIR)/man5
|
||||
install ${SELINUXOPT} -m 644 docs/source/markdown/links/*1 -t $(DESTDIR)$(MANDIR)/man1
|
||||
|
||||
.PHONY: install.man
|
||||
install.man: docs install.man-nobuild
|
||||
|
||||
.PHONY: install.config
|
||||
install.config:
|
||||
install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(SHAREDIR_CONTAINERS)
|
||||
|
|
|
@ -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
|
||||
PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
|
||||
install.bin-nobuild \
|
||||
install.remote-nobuild \
|
||||
%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.cni \
|
||||
install.systemd \
|
||||
install.completions
|
||||
install.man-nobuild \
|
||||
%endif
|
||||
install.cni \
|
||||
install.systemd \
|
||||
install.completions
|
||||
|
||||
mv pkg/hooks/README.md pkg/hooks/README-hooks.md
|
||||
|
||||
|
|
Loading…
Reference in a new issue