Revision: 7068
Author: ek.kato
Date: Tue May 10 10:45:18 2011
Log: * Merge r7061 from trunk.
http://code.google.com/p/uim/source/detail?r=7068
Modified:
/branches/1.7/configure.ac
/branches/1.7/qt4/toolbar/CMakeLists.txt
=======================================
--- /branches/1.7/configure.ac Tue May 10 01:55:03 2011
+++ /branches/1.7/configure.ac Tue May 10 10:45:18 2011
@@ -1968,7 +1968,7 @@
${CMAKE} \
-DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
-DCMAKE_BUILD_TYPE=${cmake_build_type} \
- -DCMAKE_INSTALL_PREFIX=`$KDE4_CONFIG --prefix` \
+ -DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_SKIP_RPATH=true -DKDE4_USE_ALWAYS_FULL_RPATH=false \
${ac_abs_top_srcdir}/qt4/toolbar
cd -
=======================================
--- /branches/1.7/qt4/toolbar/CMakeLists.txt Sat May 7 06:59:55 2011
+++ /branches/1.7/qt4/toolbar/CMakeLists.txt Tue May 10 10:45:18 2011
@@ -21,4 +21,4 @@
-luim -luim-scm)
install(TARGETS plasma_applet_uim DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES plasma-applet-uim.desktop DESTINATION
${SERVICES_INSTALL_DIR})
+install(FILES ${CMAKE_BINARY_DIR}/../plasma-applet-uim.desktop DESTINATION
${SERVICES_INSTALL_DIR})
