diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
| commit | ba933811da6886003e6c2fa339a36a33e644fe1b (patch) | |
| tree | 26c32f44cf11454c87668e78c1cb280a111c9019 | |
| parent | eedf09ff395e6a32efa8ec6b86bcf889ef088e13 (diff) | |
| download | gtk-qt-engine-ba933811.tar.gz gtk-qt-engine-ba933811.zip | |
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/gtk-qt-engine@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | CMake/Modules/GtkQt.cmake | 2 | ||||
| -rw-r--r-- | autopackage/default.apspec | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMake/Modules/GtkQt.cmake b/CMake/Modules/GtkQt.cmake index 1251d95..5b72fcd 100644 --- a/CMake/Modules/GtkQt.cmake +++ b/CMake/Modules/GtkQt.cmake @@ -46,7 +46,7 @@ MACRO(GTKQT_KDE3_INSTALL_LIBTOOL_FILE _target _destination) FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n") FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n") FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n") - FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n") + FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/trinity'\n") INSTALL( FILES ${_laname} diff --git a/autopackage/default.apspec b/autopackage/default.apspec index cb6b436..dba39e3 100644 --- a/autopackage/default.apspec +++ b/autopackage/default.apspec @@ -84,9 +84,9 @@ mkdirs "$PREFIX/share/themes/Qt/gtk-2.0" copyFile --silent share/themes/Qt/gtk-2.0/gtkrc "$PREFIX/share/themes/Qt/gtk-2.0/gtkrc" outputStatus "Installing KDE control center module..." -mkdirs "$PREFIX/lib/kde3" -copyFile --silent lib/kde3/kcm_kcmgtk.so "$PREFIX/lib/kde3/kcm_kcmgtk.so" -copyFile --silent lib/kde3/kcm_kcmgtk.la "$PREFIX/lib/kde3/kcm_kcmgtk.la" +mkdirs "$PREFIX/lib/trinity" +copyFile --silent lib/trinity/kcm_kcmgtk.so "$PREFIX/lib/trinity/kcm_kcmgtk.so" +copyFile --silent lib/trinity/kcm_kcmgtk.la "$PREFIX/lib/trinity/kcm_kcmgtk.la" installMenuItem --no-path-adjust "Settings/LookNFeel" "share/applications/kcmgtk.desktop" updateEnv GTK_PATH "$PREFIX/lib/gtk-2.0" |