commit 1c26562c98200eb72ec04c6452090f0e4e757d08
Author: Elan Ruusamäe <[email protected]>
Date: Sat Jun 7 16:24:03 2014 +0300
fix build paths
kdepim.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/kdepim.spec b/kdepim.spec
index 56f4e01..4720034 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without apidocs # do not prepare API documentation
+%bcond_with apidocs # do not prepare API documentation
%bcond_without hidden_visibility # don't use gcc hidden visibility
%bcond_without kitchensync # build with kitchensync
%bcond_without indexlib # disable full text indexing support
@@ -77,7 +77,7 @@ Obsoletes: kdepim-kresources
#Obsoletes: kdepim-libkcal
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _libexecdir %{_libdir}/kde3
+%define _libexecdir %{_libdir}/trinity
%define _applnkdir %{_datadir}/applnk
# Usage: onoff BCOND_NAME
@@ -601,6 +601,9 @@ cd build
%cmake \
-Wno-dev \
+ -DPLUGIN_INSTALL_DIR=%{_libexecdir} \
+ -DHTML_INSTALL_DIR=%{_kdedocdir} \
+ -DAPPS_INSTALL_DIR=%{_applnkdir} \
-DWITH_ARTS=%{onoff arts} \
-DWITH_SASL=ON \
-DWITH_NEWDISTRLISTS=ON \
@@ -630,10 +633,12 @@ cd build
rm -f ../makeinstall.stamp
%install
+test -f makeinstall.stamp -a %{_specdir}/%{name}.spec -nt makeinstall.stamp &&
rm -f makeinstall.stamp
+
if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
- %{__make} install -j1 \
+ %{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT \
kde_htmldir=%{_kdedocdir}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdepim.git/commitdiff/1c26562c98200eb72ec04c6452090f0e4e757d08
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
