mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-24 16:10:02 -06:00
Include ipaplatform in client-only build
https://fedorahosted.org/freeipa/ticket/4533 Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
parent
9486f3dc8d
commit
72a82b855b
6
Makefile
6
Makefile
@ -71,6 +71,7 @@ client: client-autogen
|
||||
@for subdir in $(CLIENTDIRS); do \
|
||||
(cd $$subdir && $(MAKE) all) || exit 1; \
|
||||
done
|
||||
cd ipaplatform && $(PYTHON) setup.py build
|
||||
|
||||
bootstrap-autogen: version-update client-autogen
|
||||
@echo "Building IPA $(IPA_VERSION)"
|
||||
@ -96,8 +97,10 @@ client-install: client client-dirs
|
||||
cd install/po && $(MAKE) install || exit 1;
|
||||
if [ "$(DESTDIR)" = "" ]; then \
|
||||
$(PYTHON) setup-client.py install; \
|
||||
(cd ipaplatform && $(PYTHON) setup.py install); \
|
||||
else \
|
||||
$(PYTHON) setup-client.py install --root $(DESTDIR); \
|
||||
(cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR)); \
|
||||
fi
|
||||
|
||||
client-dirs:
|
||||
@ -164,12 +167,15 @@ version-update: release-update
|
||||
|
||||
server: version-update
|
||||
$(PYTHON) setup.py build
|
||||
cd ipaplatform && $(PYTHON) setup.py build
|
||||
|
||||
server-install: server
|
||||
if [ "$(DESTDIR)" = "" ]; then \
|
||||
$(PYTHON) setup.py install; \
|
||||
(cd ipaplatform && $(PYTHON) setup.py install); \
|
||||
else \
|
||||
$(PYTHON) setup.py install --root $(DESTDIR); \
|
||||
(cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR)); \
|
||||
fi
|
||||
|
||||
tests: version-update tests-man-autogen
|
||||
|
@ -342,6 +342,8 @@ make client-install DESTDIR=%{buildroot}
|
||||
%find_lang %{gettext_domain}
|
||||
|
||||
|
||||
mkdir -p %{buildroot}%{_usr}/share/ipa
|
||||
|
||||
%if ! %{ONLY_CLIENT}
|
||||
# Remove .la files from libtool - we don't want to package
|
||||
# these files
|
||||
@ -792,6 +794,7 @@ fi
|
||||
%attr(0644,root,root) %{python_sitearch}/default_encoding_utf8.so
|
||||
%{python_sitelib}/ipapython-*.egg-info
|
||||
%{python_sitelib}/freeipa-*.egg-info
|
||||
%{python_sitelib}/ipaplatform-*.egg-info
|
||||
%{python_sitearch}/python_default_encoding-*.egg-info
|
||||
%dir %attr(0755,root,root) %{_sysconfdir}/ipa/
|
||||
%ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/default.conf
|
||||
|
Loading…
Reference in New Issue
Block a user