diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-05-13 08:40:53 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-05-19 15:52:06 +0200 |
| commit | 54520064989c8a9e45bcaea2e9463c7a62416c0a (patch) | |
| tree | d8b4b8c84fe72adf0ac13dac7cd26baa9e0f8125 | |
| parent | 1276083d95b41c91796cae9f8635fa4c89635bbd (diff) | |
| download | freeipa-54520064989c8a9e45bcaea2e9463c7a62416c0a.tar.gz freeipa-54520064989c8a9e45bcaea2e9463c7a62416c0a.tar.xz freeipa-54520064989c8a9e45bcaea2e9463c7a62416c0a.zip | |
build: fix client-only build
https://fedorahosted.org/freeipa/ticket/5889
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | freeipa.spec.in | 6 | ||||
| -rw-r--r-- | ipaclient/setup.py.in | 2 | ||||
| -rwxr-xr-x | setup.py | 2 |
4 files changed, 13 insertions, 4 deletions
@@ -4,7 +4,7 @@ include VERSION SUBDIRS=asn1 daemons install ipapython ipalib -CLIENTDIRS=ipapython client asn1 +CLIENTDIRS=ipapython ipalib client asn1 CLIENTPYDIRS=ipaclient ipaplatform PRJ_PREFIX=freeipa @@ -87,6 +87,11 @@ check: bootstrap-autogen server tests (cd $$subdir && $(MAKE) check) || exit 1; \ done +client-check: client-autogen + @for subdir in $(CLIENTDIRS); do \ + (cd $$subdir && $(MAKE) check) || exit 1; \ + done + bootstrap-autogen: version-update client-autogen @echo "Building IPA $(IPA_VERSION)" cd asn1; if [ ! -e Makefile ]; then ../autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=$(LIBDIR); fi diff --git a/freeipa.spec.in b/freeipa.spec.in index 3d8593bf8..94bb1abee 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -688,7 +688,11 @@ make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client %check +%if ! %{ONLY_CLIENT} make %{?_smp_mflags} check VERBOSE=yes +%else +make %{?_smp_mflags} client-check VERBOSE=yes +%endif # ONLY_CLIENT %install @@ -1127,6 +1131,7 @@ fi %defattr(-,root,root,-) %doc README Contributors.txt %license COPYING +%{python_sitelib}/freeipa-*.egg-info %dir %{python_sitelib}/ipaserver %dir %{python_sitelib}/ipaserver/install %dir %{python_sitelib}/ipaserver/install/plugins @@ -1365,7 +1370,6 @@ fi %{python_sitelib}/ipaplatform/* %{python_sitelib}/ipapython-*.egg-info %{python_sitelib}/ipalib-*.egg-info -%{python_sitelib}/freeipa-*.egg-info %{python_sitelib}/ipaplatform-*.egg-info diff --git a/ipaclient/setup.py.in b/ipaclient/setup.py.in index af41aea53..47c9b8485 100644 --- a/ipaclient/setup.py.in +++ b/ipaclient/setup.py.in @@ -61,6 +61,8 @@ def setup_package(): package_dir = {'ipaclient': ''}, packages = ["ipaclient", ], + scripts=['../ipa'], + data_files = [('share/man/man1', ["../ipa.1"])], ) finally: del sys.path[0] @@ -83,6 +83,4 @@ setup( 'ipaserver.install.plugins', 'ipaserver.install.server', ], - scripts=['ipa'], - data_files = [('share/man/man1', ["ipa.1"])], ) |