diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-11-03 10:34:53 +0100 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-09 13:08:32 +0100 |
| commit | d3cab75d7e79fbc89ef08df3e6d2b1e28b4ef163 (patch) | |
| tree | 5d053aeb4a43c95a1e4a42e72cda91324fafe00c | |
| parent | 8ffd3bdf142f0f852918186ce0a338a7818bbe8e (diff) | |
| download | freeipa-d3cab75d7e79fbc89ef08df3e6d2b1e28b4ef163.tar.gz freeipa-d3cab75d7e79fbc89ef08df3e6d2b1e28b4ef163.tar.xz freeipa-d3cab75d7e79fbc89ef08df3e6d2b1e28b4ef163.zip | |
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>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/completion/Makefile.am | 4 | ||||
| -rw-r--r-- | contrib/completion/ipa (renamed from contrib/completion/ipa.bash_completion) | 0 | ||||
| -rw-r--r-- | freeipa.spec.in | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index a390b4eb6..e752585d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 000000000..108a8087d --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = completion + +EXTRA_DIST = \ + nssciphersuite diff --git a/contrib/completion/Makefile.am b/contrib/completion/Makefile.am new file mode 100644 index 000000000..d82c2d9a7 --- /dev/null +++ b/contrib/completion/Makefile.am @@ -0,0 +1,4 @@ +bashcompdir = $(sysconfdir)/bash_completion.d + +bashcomp_SCRIPTS = \ + ipa diff --git a/contrib/completion/ipa.bash_completion b/contrib/completion/ipa index 33ad1709b..33ad1709b 100644 --- a/contrib/completion/ipa.bash_completion +++ b/contrib/completion/ipa diff --git a/freeipa.spec.in b/freeipa.spec.in index e60270ac0..6a8d31386 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -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 |