Commit ce951132 by Dwight Engen Committed by Stéphane Graber

include python files in make dist and rpm

parent e6cde741
...@@ -6,6 +6,10 @@ SUBDIRS = config src templates doc ...@@ -6,6 +6,10 @@ SUBDIRS = config src templates doc
DIST_SUBDIRS = config src templates doc DIST_SUBDIRS = config src templates doc
EXTRA_DIST = autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog EXTRA_DIST = autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog
if ENABLE_PYTHON
RPMARGS = --with python
endif
pcdatadir = $(libdir)/pkgconfig pcdatadir = $(libdir)/pkgconfig
pcdata_DATA = lxc.pc pcdata_DATA = lxc.pc
...@@ -17,4 +21,4 @@ ChangeLog:: ...@@ -17,4 +21,4 @@ ChangeLog::
@touch ChangeLog @touch ChangeLog
rpm: dist rpm: dist
rpmbuild --clean -ta ${distdir}.tar.gz rpmbuild --clean -ta ${distdir}.tar.gz $(RPMARGS)
...@@ -32,6 +32,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ...@@ -32,6 +32,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libcap openssl rsync Requires: libcap openssl rsync
BuildRequires: libcap libcap-devel docbook2X BuildRequires: libcap libcap-devel docbook2X
%define with_python %{?_with_python: 1} %{?!_with_python: 0}
%if %{with_python}
Requires: python3
BuildRequires: python3-devel
%endif
%description %description
The package "%{name}" provides the command lines to create and manage The package "%{name}" provides the command lines to create and manage
...@@ -62,7 +68,11 @@ development of the linux containers. ...@@ -62,7 +68,11 @@ development of the linux containers.
%prep %prep
%setup %setup
%build %build
PATH=$PATH:/usr/sbin:/sbin %configure $args --disable-rpath PATH=$PATH:/usr/sbin:/sbin %configure $args \
%if %{with_python}
--enable-python \
%endif
--disable-rpath
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
...@@ -97,6 +107,9 @@ rm -rf %{buildroot} ...@@ -97,6 +107,9 @@ rm -rf %{buildroot}
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_libdir}/%{name} %{_libdir}/%{name}
%if %{with_python}
%{_libdir}/python*
%endif
%{_localstatedir}/* %{_localstatedir}/*
%attr(4555,root,root) %{_libexecdir}/%{name}/lxc-init %attr(4555,root,root) %{_libexecdir}/%{name}/lxc-init
......
...@@ -125,6 +125,7 @@ bin_SCRIPTS = \ ...@@ -125,6 +125,7 @@ bin_SCRIPTS = \
lxc-destroy lxc-destroy
if ENABLE_PYTHON if ENABLE_PYTHON
EXTRA_DIST = lxc-device lxc-ls
bin_SCRIPTS += lxc-device bin_SCRIPTS += lxc-device
bin_SCRIPTS += lxc-ls bin_SCRIPTS += lxc-ls
bin_SCRIPTS += lxc-start-ephemeral bin_SCRIPTS += lxc-start-ephemeral
......
if ENABLE_PYTHON if ENABLE_PYTHON
EXTRA_DIST = setup.py lxc.c
if HAVE_DEBIAN if HAVE_DEBIAN
DISTSETUPOPTS=--install-layout=deb DISTSETUPOPTS=--install-layout=deb
else else
......
EXTRA_DIST=lxc-ubuntu
templatesdir=@LXCTEMPLATEDIR@ templatesdir=@LXCTEMPLATEDIR@
templates_SCRIPTS = \ templates_SCRIPTS = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment