packages: kadu/kadu.spec - build cmake targets in build - more clean

cactus cactus at pld-linux.org
Sat May 9 14:05:54 CEST 2009


Author: cactus                       Date: Sat May  9 12:05:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build cmake targets in build - more clean

---- Files affected:
packages/kadu:
   kadu.spec (1.209 -> 1.210) 

---- Diffs:

================================================================
Index: packages/kadu/kadu.spec
diff -u packages/kadu/kadu.spec:1.209 packages/kadu/kadu.spec:1.210
--- packages/kadu/kadu.spec:1.209	Sat May  9 13:31:38 2009
+++ packages/kadu/kadu.spec	Sat May  9 14:05:49 2009
@@ -1147,6 +1147,8 @@
 %{__sed} -i 's,dataPath("kadu/modules/*,("%{modules_data_dir}/,g' kadu-core/modules.cpp
 
 %build
+install -d build
+
 %if %{with agent}
 %{__sed} -i 's/module_agent=n/module_agent=m/' .config
 %else
@@ -1421,6 +1423,7 @@
 %{__sed} -i 's/icons_oxygen16=n/icons_oxygen16=y/' .config
 %{__sed} -i 's/icons_tango16=n/icons_tango16=y/' .config
 
+cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DSYSCONF_INSTALL_DIR=%{_sysconfdir} \
@@ -1428,14 +1431,14 @@
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
-	.
+	..
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-%{__make} install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
@@ -2148,6 +2151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.210  2009/05/09 12:05:49  cactus
+- build cmake targets in build - more clean
+
 Revision 1.209  2009/05/09 11:31:38  cactus
 - x86_64 fix modules installation
 - create _pixmapdir
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kadu/kadu.spec?r1=1.209&r2=1.210&f=u



More information about the pld-cvs-commit mailing list