diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-10-12 17:13:36 +0200 |
|---|---|---|
| committer | David Kupka <dkupka@redhat.com> | 2016-10-24 13:30:12 +0200 |
| commit | 329f080e6ac832ffd568e79ebca9907771f8ad61 (patch) | |
| tree | 99ebbd5da52e9944e3a1fe9e443ae7ec5ec90943 /freeipa.spec.in | |
| parent | e12a70a8b1aa5daac4b8ab7ac681b09f664a8357 (diff) | |
| download | freeipa-329f080e6ac832ffd568e79ebca9907771f8ad61.tar.gz freeipa-329f080e6ac832ffd568e79ebca9907771f8ad61.tar.xz freeipa-329f080e6ac832ffd568e79ebca9907771f8ad61.zip | |
Build: pass down LIBDIR definition from RPM SPEC to Makefile
Previously the value was sometimes lost. This was causing problems in
later stages of refactoring.
https://fedorahosted.org/freeipa/ticket/6418
Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Diffstat (limited to 'freeipa.spec.in')
| -rw-r--r-- | freeipa.spec.in | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index 49e20f676..04e194921 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -664,7 +664,7 @@ rm -f ipaplatform/services.py rm -f ipaplatform/tasks.py rm -f ipaplatform/paths.py rm -f ipaplatform/constants.py -make version-update +make LIBDIR=%{_libdir} version-update cd client; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir}; cd .. %if ! %{ONLY_CLIENT} cd daemons; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localstatedir=%{_localstatedir} --libdir=%{_libdir} --mandir=%{_mandir} --with-openldap; cd .. @@ -672,17 +672,17 @@ cd install; ../autogen.sh --prefix=%{_usr} --sysconfdir=%{_sysconfdir} --localst %endif # ONLY_CLIENT %if ! %{ONLY_CLIENT} -make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} all +make IPA_VERSION_IS_GIT_SNAPSHOT=no LIBDIR=%{_libdir} %{?_smp_mflags} all %else -make IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} client +make IPA_VERSION_IS_GIT_SNAPSHOT=no LIBDIR=%{_libdir} %{?_smp_mflags} client %endif # ONLY_CLIENT %check %if ! %{ONLY_CLIENT} -make %{?_smp_mflags} check VERBOSE=yes +make %{?_smp_mflags} check VERBOSE=yes LIBDIR=%{_libdir} %else -make %{?_smp_mflags} client-check VERBOSE=yes +make %{?_smp_mflags} client-check VERBOSE=yes LIBDIR=%{_libdir} %endif # ONLY_CLIENT @@ -696,9 +696,9 @@ rm -f ipaplatform/services.py rm -f ipaplatform/tasks.py rm -f ipaplatform/paths.py rm -f ipaplatform/constants.py -make version-update +make version-update LIBDIR=%{_libdir} %if ! %{ONLY_CLIENT} -make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} mv %{buildroot}%{_bindir}/ipa-run-tests %{buildroot}%{_bindir}/ipa-run-tests-%{python2_version} mv %{buildroot}%{_bindir}/ipa-test-config %{buildroot}%{_bindir}/ipa-test-config-%{python2_version} @@ -722,12 +722,12 @@ ln -s %{_bindir}/ipa-test-config-%{python2_version} %{buildroot}%{_bindir}/ipa-t ln -s %{_bindir}/ipa-test-task-%{python2_version} %{buildroot}%{_bindir}/ipa-test-task %else -make client-install DESTDIR=%{buildroot} +make client-install DESTDIR=%{buildroot} LIBDIR=%{_libdir} %endif # ONLY_CLIENT %if 0%{?with_python3} -(cd ipalib && make PYTHON=%{__python3} IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} DESTDIR=%{buildroot} install) -(cd ipapython && make PYTHON=%{__python3} IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} DESTDIR=%{buildroot} install) +(cd ipalib && make PYTHON=%{__python3} IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} DESTDIR=%{buildroot} LIBDIR=%{_libdir} install) +(cd ipapython && make PYTHON=%{__python3} IPA_VERSION_IS_GIT_SNAPSHOT=no %{?_smp_mflags} DESTDIR=%{buildroot} LIBDIR=%{_libdir} install) (cd ipaplatform && %{__python3} setup.py install --root %{buildroot}) (cd ipaclient && %{__python3} setup.py install --root %{buildroot}) %endif # with_python3 |