コミット: 174c5573580b680a5cc5c9f75ceca4cf431d3521 - uim (git)

A multilingual input method framework

コミットメタ情報

• リビジョン: 174c5573580b680a5cc5c9f75ceca4cf431d3521 (tree)
• 日時: 2011-05-11 02:46:23
• 作者: ek.kato <ek.kato@ff9a...>
• コミッター: ek.kato

ログメッセージ

* Tag uim-1.7.0-alpha from branches/1.7 r7068.

変更サマリ

• modified: configure.ac
• modified: qt4/toolbar/CMakeLists.txt

差分

--- a/configure.ac
+++ b/configure.ac
@@ -1968,7 +1968,7 @@ if test x$use_qt4 = xyes; then
         ${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 -

--- a/qt4/toolbar/CMakeLists.txt
+++ b/qt4/toolbar/CMakeLists.txt
@@ -21,4 +21,4 @@ target_link_libraries(plasma_applet_uim ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}
         -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})