build: fix client-only build

https://fedorahosted.org/freeipa/ticket/5889

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Jan Cholasta
2016-05-13 08:40:53 +02:00
committed by Martin Basti
parent 1276083d95
commit 5452006498
4 changed files with 13 additions and 4 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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]

View File

@@ -83,6 +83,4 @@ setup(
'ipaserver.install.plugins',
'ipaserver.install.server',
],
scripts=['ipa'],
data_files = [('share/man/man1', ["ipa.1"])],
)