mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
Merge trift2.:/MySQL/M51/push-5.1
into trift2.:/MySQL/M51/bug24182-5.1
This commit is contained in:
commit
2467dc1423
1 changed files with 6 additions and 1 deletions
|
@ -386,7 +386,7 @@ install -d $RBR%{_sbindir}
|
||||||
|
|
||||||
|
|
||||||
# Install all binaries
|
# Install all binaries
|
||||||
(cd $MBD && make install DESTDIR=$RBR)
|
(cd $MBD && make install DESTDIR=$RBR benchdir_root=%{_datadir})
|
||||||
# Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do
|
# Old packages put shared libs in %{_libdir}/ (not %{_libdir}/mysql), so do
|
||||||
# the same here.
|
# the same here.
|
||||||
mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/
|
mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/
|
||||||
|
@ -689,6 +689,11 @@ fi
|
||||||
# itself - note that they must be ordered by date (important when
|
# itself - note that they must be ordered by date (important when
|
||||||
# merging BK trees)
|
# merging BK trees)
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
|
||||||
|
|
||||||
|
- Call "make install" using "benchdir_root=%{_datadir}",
|
||||||
|
because that is affecting the regression test suite as well.
|
||||||
|
|
||||||
* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
|
* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
|
||||||
|
|
||||||
- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
|
- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
|
||||||
|
|
Loading…
Reference in a new issue