Build: integrate contrib directory into build system

BASH completion is now installed by make install.

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

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Petr Spacek
2016-11-03 10:34:53 +01:00
committed by Martin Babinsky
parent 8ffd3bdf14
commit d3cab75d7e
5 changed files with 10 additions and 4 deletions

View File

@@ -1,5 +1,4 @@
SUBDIRS = asn1 util client daemons install ipaclient ipalib ipaplatform ipapython ipaserver ipatests po
# contrib
SUBDIRS = asn1 util client contrib daemons install ipaclient ipalib ipaplatform ipapython ipaserver ipatests po
# doc
# init
@@ -23,5 +22,6 @@ EXTRA_DIST = .mailmap \
BUILD.txt \
Contributors.txt \
COPYING.openssl \
contrib \
pylintrc \
pytest.ini

4
contrib/Makefile.am Normal file
View File

@@ -0,0 +1,4 @@
SUBDIRS = completion
EXTRA_DIST = \
nssciphersuite

View File

@@ -0,0 +1,4 @@
bashcompdir = $(sysconfdir)/bash_completion.d
bashcomp_SCRIPTS = \
ipa

View File

@@ -833,8 +833,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/ipa/
/bin/touch %{buildroot}%{_sysconfdir}/ipa/ca.crt
mkdir -p %{buildroot}%{_sysconfdir}/ipa/nssdb
mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa-client/sysrestore
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
install -pm 644 contrib/completion/ipa.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/ipa
%if ! %{ONLY_CLIENT}
mkdir -p %{buildroot}%{_sysconfdir}/cron.d