[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/frameworks] /: Use custom variable CALLIGRA_PLUGIN_INSTALL_DIR for Calligra plugins
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-03-31 20:22:30
Message-ID: E1Yd2gA-0000dd-AR () scm ! kde ! org
[Download RAW message or body]

Git commit 7a932ac14ee4a5fd5aa629e8340c7b1f80127091 by Friedrich W. H. Koss=
ebau.
Committed on 31/03/2015 at 20:20.
Pushed by kossebau into branch 'frameworks'.

Use custom variable CALLIGRA_PLUGIN_INSTALL_DIR for Calligra plugins

integration plugins (thumbnailer, okuluar, imageio) might need the
normal path of PLUGIN_INSTALL_DIR

M  +2    -2    CMakeLists.txt
M  +1    -1    braindump/plugins/quickstates/CMakeLists.txt
M  +1    -1    braindump/plugins/stateshape/CMakeLists.txt
M  +1    -1    braindump/plugins/webshape/CMakeLists.txt
M  +1    -1    filters/flow/imageexport/CMakeLists.txt
M  +1    -1    filters/flow/visio/import/CMakeLists.txt
M  +1    -1    filters/flow/wpg/import/CMakeLists.txt
M  +1    -1    filters/karbon/eps/CMakeLists.txt
M  +1    -1    filters/karbon/image/CMakeLists.txt
M  +1    -1    filters/karbon/karbon1.x/CMakeLists.txt
M  +1    -1    filters/karbon/pdf/CMakeLists.txt
M  +2    -2    filters/karbon/svg/CMakeLists.txt
M  +2    -2    filters/karbon/wmf/CMakeLists.txt
M  +1    -1    filters/karbon/wpg/CMakeLists.txt
M  +2    -2    filters/karbon/xaml/CMakeLists.txt
M  +1    -1    filters/karbon/xfig/CMakeLists.txt
M  +1    -1    filters/plan/mpxj/import/CMakeLists.txt
M  +1    -1    filters/plan/mpxj/planconvert/CMakeLists.txt
M  +1    -1    filters/sheets/applixspread/CMakeLists.txt
M  +2    -2    filters/sheets/csv/CMakeLists.txt
M  +1    -1    filters/sheets/dbase/CMakeLists.txt
M  +1    -1    filters/sheets/excel/export/CMakeLists.txt
M  +2    -2    filters/sheets/excel/import/CMakeLists.txt
M  +2    -2    filters/sheets/gnumeric/CMakeLists.txt
M  +2    -2    filters/sheets/html/CMakeLists.txt
M  +1    -1    filters/sheets/latex/export/CMakeLists.txt
M  +2    -2    filters/sheets/opencalc/CMakeLists.txt
M  +1    -1    filters/sheets/qpro/CMakeLists.txt
M  +1    -1    filters/sheets/xlsx/CMakeLists.txt
M  +1    -1    filters/stage/keynote/import/CMakeLists.txt
M  +1    -1    filters/stage/kpr2odf/CMakeLists.txt
M  +1    -1    filters/stage/powerpoint/CMakeLists.txt
M  +1    -1    filters/stage/pptx/CMakeLists.txt
M  +1    -1    filters/words/applixword/CMakeLists.txt
M  +2    -2    filters/words/ascii/CMakeLists.txt
M  +1    -1    filters/words/docx/export/CMakeLists.txt
M  +2    -2    filters/words/docx/import/CMakeLists.txt
M  +2    -2    filters/words/epub/CMakeLists.txt
M  +1    -1    filters/words/mobi/CMakeLists.txt
M  +1    -1    filters/words/msword-odf/CMakeLists.txt
M  +1    -1    filters/words/rtf/import/CMakeLists.txt
M  +1    -1    filters/words/wiki/export/CMakeLists.txt
M  +1    -1    filters/words/wordperfect/import/CMakeLists.txt
M  +1    -1    filters/words/works/import/CMakeLists.txt
M  +1    -1    flow/part/CMakeLists.txt
M  +1    -1    flow/plugins/dockers/CMakeLists.txt
M  +1    -1    karbon/CMakeLists.txt
M  +1    -1    karbon/plugins/filtereffects/CMakeLists.txt
M  +1    -1    karbon/plugins/flattenpath/CMakeLists.txt
M  +1    -1    karbon/plugins/refinepath/CMakeLists.txt
M  +1    -1    karbon/plugins/roundcorners/CMakeLists.txt
M  +1    -1    karbon/plugins/tools/CMakeLists.txt
M  +1    -1    karbon/plugins/whirlpinch/CMakeLists.txt
M  +2    -2    kexi/formeditor/factories/CMakeLists.txt
M  +1    -1    kexi/migration/mdb/src/CMakeLists.txt
M  +1    -1    kexi/migration/mysql/CMakeLists.txt
M  +1    -1    kexi/migration/pqxx/CMakeLists.txt
M  +1    -1    kexi/migration/sybase/CMakeLists.txt
M  +1    -1    kexi/migration/txt/CMakeLists.txt
M  +1    -1    kexi/migration/xbase/CMakeLists.txt
M  +2    -2    kexi/plugins/forms/CMakeLists.txt
M  +1    -1    kexi/plugins/forms/widgets/mapbrowser/CMakeLists.txt
M  +1    -1    kexi/plugins/forms/widgets/webbrowser/CMakeLists.txt
M  +1    -1    kexi/plugins/importexport/csv/CMakeLists.txt
M  +1    -1    kexi/plugins/migration/CMakeLists.txt
M  +1    -1    kexi/plugins/queries/CMakeLists.txt
M  +1    -1    kexi/plugins/reports/CMakeLists.txt
M  +1    -1    kexi/plugins/scripting/kexidb/CMakeLists.txt
M  +1    -1    kexi/plugins/scripting/kexiscripting/CMakeLists.txt
M  +1    -1    kexi/plugins/shapes/relationdesign/CMakeLists.txt
M  +1    -1    kexi/plugins/tables/CMakeLists.txt
M  +1    -1    krita/plugins/assistants/RulerAssistant/CMakeLists.txt
M  +1    -1    krita/plugins/colorspaces/extensions/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/bigbrother/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/clonesarray/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/colorrange/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/colorspaceconversion/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/advancedcolorselector/CMake=
Lists.txt
M  +1    -1    krita/plugins/extensions/dockers/artisticcolorselector/CMake=
Lists.txt
M  +1    -1    krita/plugins/extensions/dockers/channeldocker/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/colorslider/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/compositiondocker/CMakeList=
s.txt
M  +1    -1    krita/plugins/extensions/dockers/defaultdockers/CMakeLists.t=
xt
M  +1    -1    krita/plugins/extensions/dockers/digitalmixer/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/historydocker/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/imagedocker/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/lut/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/overview/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/palettedocker/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/patterndocker/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/presetdocker/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dockers/smallcolorselector/CMakeLis=
ts.txt
M  +1    -1    krita/plugins/extensions/dockers/specificcolorselector/CMake=
Lists.txt
M  +1    -1    krita/plugins/extensions/dockers/tasksetdocker/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/dropshadow/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/gmic/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/histogram/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/imagesize/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/imagesplit/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/layergroupswitcher/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/layersplit/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/metadataeditor/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/modify_selection/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/offsetimage/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/resourcemanager/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/rotateimage/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/separate_channels/CMakeLists.txt
M  +1    -1    krita/plugins/extensions/shearimage/CMakeLists.txt
M  +1    -1    krita/plugins/filters/blur/CMakeLists.txt
M  +1    -1    krita/plugins/filters/colors/CMakeLists.txt
M  +1    -1    krita/plugins/filters/colorsfilters/CMakeLists.txt
M  +1    -1    krita/plugins/filters/convolutionfilters/CMakeLists.txt
M  +1    -1    krita/plugins/filters/dodgeburn/CMakeLists.txt
M  +1    -1    krita/plugins/filters/embossfilter/CMakeLists.txt
M  +1    -1    krita/plugins/filters/example/CMakeLists.txt
M  +1    -1    krita/plugins/filters/fastcolortransfer/CMakeLists.txt
M  +1    -1    krita/plugins/filters/imageenhancement/CMakeLists.txt
M  +1    -1    krita/plugins/filters/indexcolors/CMakeLists.txt
M  +1    -1    krita/plugins/filters/levelfilter/CMakeLists.txt
M  +1    -1    krita/plugins/filters/noisefilter/CMakeLists.txt
M  +1    -1    krita/plugins/filters/oilpaintfilter/CMakeLists.txt
M  +1    -1    krita/plugins/filters/phongbumpmap/CMakeLists.txt
M  +1    -1    krita/plugins/filters/pixelizefilter/CMakeLists.txt
M  +1    -1    krita/plugins/filters/posterize/CMakeLists.txt
M  +1    -1    krita/plugins/filters/raindropsfilter/CMakeLists.txt
M  +1    -1    krita/plugins/filters/randompickfilter/CMakeLists.txt
M  +1    -1    krita/plugins/filters/roundcorners/CMakeLists.txt
M  +1    -1    krita/plugins/filters/smalltilesfilter/CMakeLists.txt
M  +1    -1    krita/plugins/filters/sobelfilter/CMakeLists.txt
M  +1    -1    krita/plugins/filters/unsharp/CMakeLists.txt
M  +1    -1    krita/plugins/filters/wavefilter/CMakeLists.txt
M  +2    -2    krita/plugins/formats/bmp/CMakeLists.txt
M  +2    -2    krita/plugins/formats/eps/CMakeLists.txt
M  +2    -2    krita/plugins/formats/exr/CMakeLists.txt
M  +2    -2    krita/plugins/formats/heightmap/CMakeLists.txt
M  +2    -2    krita/plugins/formats/jp2/CMakeLists.txt
M  +2    -2    krita/plugins/formats/jpeg/CMakeLists.txt
M  +1    -1    krita/plugins/formats/odg/CMakeLists.txt
M  +2    -2    krita/plugins/formats/oiio/CMakeLists.txt
M  +2    -2    krita/plugins/formats/ora/CMakeLists.txt
M  +1    -1    krita/plugins/formats/pdf/CMakeLists.txt
M  +2    -2    krita/plugins/formats/png/CMakeLists.txt
M  +2    -2    krita/plugins/formats/ppm/CMakeLists.txt
M  +2    -2    krita/plugins/formats/psd/CMakeLists.txt
M  +1    -1    krita/plugins/formats/qml/CMakeLists.txt
M  +1    -1    krita/plugins/formats/raw/CMakeLists.txt
M  +2    -2    krita/plugins/formats/tga/CMakeLists.txt
M  +2    -2    krita/plugins/formats/tiff/CMakeLists.txt
M  +1    -1    krita/plugins/formats/xcf/CMakeLists.txt
M  +1    -1    krita/plugins/generators/pattern/CMakeLists.txt
M  +1    -1    krita/plugins/generators/solid/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/chalk/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/colorsmudge/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/curvebrush/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/defaultpaintops/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/deform/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/dynadraw/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/experiment/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/filterop/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/gridbrush/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/hairy/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/hatching/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/particle/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/sketch/CMakeLists.txt
M  +1    -1    krita/plugins/paintops/spray/CMakeLists.txt
M  +1    -1    krita/plugins/tools/defaulttools/CMakeLists.txt
M  +1    -1    krita/plugins/tools/selectiontools/CMakeLists.txt
M  +1    -1    krita/plugins/tools/tool_crop/CMakeLists.txt
M  +1    -1    krita/plugins/tools/tool_dyna/CMakeLists.txt
M  +1    -1    krita/plugins/tools/tool_grid/CMakeLists.txt
M  +1    -1    krita/plugins/tools/tool_perspectivegrid/CMakeLists.txt
M  +1    -1    krita/plugins/tools/tool_polygon/CMakeLists.txt
M  +1    -1    krita/plugins/tools/tool_polyline/CMakeLists.txt
M  +1    -1    krita/plugins/tools/tool_text/CMakeLists.txt
M  +1    -1    krita/plugins/tools/tool_transform2/CMakeLists.txt
M  +1    -1    libs/basicflakes/plugin/CMakeLists.txt
M  +1    -1    libs/kopageapp/tools/backgroundTool/CMakeLists.txt
M  +1    -1    plan/CMakeLists.txt
M  +1    -1    plan/plugins/filters/icalendar/export/CMakeLists.txt
M  +1    -1    plan/plugins/filters/kplato/import/CMakeLists.txt
M  +1    -1    plan/plugins/schedulers/rcps/CMakeLists.txt
M  +1    -1    plan/plugins/schedulers/tj/CMakeLists.txt
M  +1    -1    plan/plugins/scripting/CMakeLists.txt
M  +1    -1    plan/workpackage/CMakeLists.txt
M  +1    -1    plugins/artistictextshape/CMakeLists.txt
M  +1    -1    plugins/chartshape/CMakeLists.txt
M  +1    -1    plugins/colorengines/lcms2/CMakeLists.txt
M  +1    -1    plugins/commentshape/CMakeLists.txt
M  +1    -1    plugins/defaultTools/CMakeLists.txt
M  +1    -1    plugins/dockers/CMakeLists.txt
M  +1    -1    plugins/formulashape/CMakeLists.txt
M  +1    -1    plugins/kexi/spreadsheet/CMakeLists.txt
M  +1    -1    plugins/musicshape/CMakeLists.txt
M  +1    -1    plugins/pathshapes/CMakeLists.txt
M  +1    -1    plugins/pictureshape/CMakeLists.txt
M  +1    -1    plugins/pluginshape/CMakeLists.txt
M  +1    -1    plugins/semanticitems/authorsection/CMakeLists.txt
M  +1    -1    plugins/semanticitems/contact/CMakeLists.txt
M  +1    -1    plugins/semanticitems/event/CMakeLists.txt
M  +1    -1    plugins/semanticitems/location/CMakeLists.txt
M  +1    -1    plugins/spacenavigator/CMakeLists.txt
M  +1    -1    plugins/staging/googledocs/CMakeLists.txt
M  +1    -1    plugins/staging/pivottables/CMakeLists.txt
M  +1    -1    plugins/staging/templateshape/CMakeLists.txt
M  +1    -1    plugins/staging/threedshape/CMakeLists.txt
M  +1    -1    plugins/textediting/autocorrection/CMakeLists.txt
M  +1    -1    plugins/textediting/changecase/CMakeLists.txt
M  +1    -1    plugins/textediting/spellcheck/CMakeLists.txt
M  +1    -1    plugins/textediting/thesaurus/CMakeLists.txt
M  +1    -1    plugins/textshape/CMakeLists.txt
M  +1    -1    plugins/variables/CMakeLists.txt
M  +1    -1    plugins/vectorshape/CMakeLists.txt
M  +1    -1    plugins/videoshape/CMakeLists.txt
M  +1    -1    sheets/CMakeLists.txt
M  +13   -13   sheets/functions/CMakeLists.txt
M  +1    -1    sheets/plugins/calendar/CMakeLists.txt
M  +1    -1    sheets/plugins/scripting/CMakeLists.txt
M  +1    -1    sheets/plugins/solver/CMakeLists.txt
M  +2    -2    sheets/shape/CMakeLists.txt
M  +1    -1    stage/part/CMakeLists.txt
M  +1    -1    stage/part/tools/animationtool/CMakeLists.txt
M  +1    -1    stage/plugins/eventactions/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/barwipe/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/clockwipe/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/edgewipe/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/example/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/fade/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/iriswipe/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/matrixwipe/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/slidewipe/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/spacerotation/CMakeLists.txt
M  +1    -1    stage/plugins/pageeffects/swapeffect/CMakeLists.txt
M  +1    -1    stage/plugins/shapeanimations/example/CMakeLists.txt
M  +1    -1    stage/plugins/variable/CMakeLists.txt
M  +2    -2    words/part/CMakeLists.txt
M  +1    -1    words/plugins/scripting/CMakeLists.txt

http://commits.kde.org/calligra/7a932ac14ee4a5fd5aa629e8340c7b1f80127091

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43d5dc5..0ec6ea4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,8 +242,8 @@ if(NOT ${QTVERSION} VERSION_LESS 4.8.0)
     )
 endif()
 =

-# override the kf5 plugin installdir
-set(PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/calligra)
+# set custom calligra plugin installdir
+set(CALLIGRA_PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/calligra)
 =

 =

  ###########################
diff --git a/braindump/plugins/quickstates/CMakeLists.txt b/braindump/plugi=
ns/quickstates/CMakeLists.txt
index 71de894..b56654c 100644
--- a/braindump/plugins/quickstates/CMakeLists.txt
+++ b/braindump/plugins/quickstates/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(braindumpquickstates MODULE ${braindumpquicksta=
tes_PART_SRCS})
 =

 target_link_libraries(braindumpquickstates ${FLAKE_LIBRARY} ${KOTEXT_LIBRA=
RY} ${KOBASE_LIBRARY}  braindumpcore)
 =

-install(TARGETS braindumpquickstates  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS braindumpquickstates  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 ########### install files ###############
 =

diff --git a/braindump/plugins/stateshape/CMakeLists.txt b/braindump/plugin=
s/stateshape/CMakeLists.txt
index 0fd76bf..38c9c5e 100644
--- a/braindump/plugins/stateshape/CMakeLists.txt
+++ b/braindump/plugins/stateshape/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(
     Qt5::Core
     braindumpcore
     )
-install(TARGETS braindump_shape_state DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS braindump_shape_state DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 ########### install files ###############
 =

diff --git a/braindump/plugins/webshape/CMakeLists.txt b/braindump/plugins/=
webshape/CMakeLists.txt
index 4eddb81..07b25ba 100644
--- a/braindump/plugins/webshape/CMakeLists.txt
+++ b/braindump/plugins/webshape/CMakeLists.txt
@@ -23,7 +23,7 @@ target_link_libraries(
     Qt5::Core
     Qt5::WebKitWidgets
     )
-install(TARGETS braindump_shape_web DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS braindump_shape_web DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 ########### install files ###############
 =

diff --git a/filters/flow/imageexport/CMakeLists.txt b/filters/flow/imageex=
port/CMakeLists.txt
index 0c2bcad..d84218c 100644
--- a/filters/flow/imageexport/CMakeLists.txt
+++ b/filters/flow/imageexport/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(flowimageexport MODULE ${flowimageexport_PART=
_SRCS})
 =

 target_link_libraries(flowimageexport  flowcommon )
 =

-install(TARGETS flowimageexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS flowimageexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/filters/flow/visio/import/CMakeLists.txt b/filters/flow/visio/=
import/CMakeLists.txt
index 780df81..aa566b7 100644
--- a/filters/flow/visio/import/CMakeLists.txt
+++ b/filters/flow/visio/import/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(calligra_filter_vsdx2odg MODULE ${vsdx2odg_PA=
RT_SRCS})
 =

 target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIE=
S} ${LIBREVENGE_LIBRARIES} ${LIBVISIO_LIBRARIES})
 =

-install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_vsdx2odg DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INST=
ALL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
diff --git a/filters/flow/wpg/import/CMakeLists.txt b/filters/flow/wpg/impo=
rt/CMakeLists.txt
index bdfcbeb..558eee21 100644
--- a/filters/flow/wpg/import/CMakeLists.txt
+++ b/filters/flow/wpg/import/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(calligra_filter_wpg2odg MODULE ${wpg2odg_PART=
_SRCS})
 =

 target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES=
} ${LIBREVENGE_LIBRARIES} ${LIBWPG_LIBRARIES})
 =

-install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_wpg2odg DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTA=
LL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
diff --git a/filters/karbon/eps/CMakeLists.txt b/filters/karbon/eps/CMakeLi=
sts.txt
index 6332bf8..2cdcfc1 100644
--- a/filters/karbon/eps/CMakeLists.txt
+++ b/filters/karbon/eps/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(calligra_filter_eps2svgai MODULE ${eps2svgai_=
PART_SRCS})
 =

 target_link_libraries(calligra_filter_eps2svgai komain)
 =

-install(TARGETS calligra_filter_eps2svgai  DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS calligra_filter_eps2svgai  DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 =

 install(FILES
     calligra_filter_eps2svgai.desktop
diff --git a/filters/karbon/image/CMakeLists.txt b/filters/karbon/image/CMa=
keLists.txt
index e005e48..39a30cb 100644
--- a/filters/karbon/image/CMakeLists.txt
+++ b/filters/karbon/image/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(calligra_filter_karbon2image MODULE ${karbon2=
image_PART_SRCS})
 =

 target_link_libraries(calligra_filter_karbon2image karbonui komain)
 =

-install(TARGETS calligra_filter_karbon2image  DESTINATION ${PLUGIN_INSTALL=
_DIR})
+install(TARGETS calligra_filter_karbon2image  DESTINATION ${CALLIGRA_PLUGI=
N_INSTALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/filters/karbon/karbon1.x/CMakeLists.txt b/filters/karbon/karbo=
n1.x/CMakeLists.txt
index 8256255..0f9b6a0 100644
--- a/filters/karbon/karbon1.x/CMakeLists.txt
+++ b/filters/karbon/karbon1.x/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(calligra_filter_karbon1x2karbon MODULE ${karb=
on1x2karbon_PART_SRCS})
 =

 target_link_libraries(calligra_filter_karbon1x2karbon karboncommon)
 =

-install(TARGETS calligra_filter_karbon1x2karbon DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS calligra_filter_karbon1x2karbon DESTINATION ${CALLIGRA_PLU=
GIN_INSTALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLi=
sts.txt
index 9323405..cb38f50 100644
--- a/filters/karbon/pdf/CMakeLists.txt
+++ b/filters/karbon/pdf/CMakeLists.txt
@@ -16,7 +16,7 @@ if(OPENJPEG_FOUND)
     target_link_libraries(calligra_filter_pdf2svg ${OPENJPEG_LIBRARIES})
 endif()
 =

-install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_pdf2svg DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/filters/karbon/svg/CMakeLists.txt b/filters/karbon/svg/CMakeLi=
sts.txt
index 408a6a8..4c1e69c 100644
--- a/filters/karbon/svg/CMakeLists.txt
+++ b/filters/karbon/svg/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(calligra_filter_karbon2svg MODULE ${karbon2sv=
g_PART_SRCS})
 =

 target_link_libraries(calligra_filter_karbon2svg karbonui)
 =

-install(TARGETS calligra_filter_karbon2svg DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS calligra_filter_karbon2svg DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 =

 install( FILES  calligra_filter_karbon2svg.desktop  DESTINATION ${SERVICES=
_INSTALL_DIR}/calligra)
 =

@@ -32,7 +32,7 @@ add_library(calligra_filter_svg2karbon MODULE ${svg2karbo=
n_PART_SRCS})
 =

 target_link_libraries(calligra_filter_svg2karbon karbonui)
 =

-install(TARGETS calligra_filter_svg2karbon  DESTINATION ${PLUGIN_INSTALL_D=
IR})
+install(TARGETS calligra_filter_svg2karbon  DESTINATION ${CALLIGRA_PLUGIN_=
INSTALL_DIR})
 =

 install( FILES  calligra_filter_svg2karbon.desktop calligra_filter_svgz2ka=
rbon.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
 =

diff --git a/filters/karbon/wmf/CMakeLists.txt b/filters/karbon/wmf/CMakeLi=
sts.txt
index 7ad6d09..9d9c6e1 100644
--- a/filters/karbon/wmf/CMakeLists.txt
+++ b/filters/karbon/wmf/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(calligra_filter_wmf2svg MODULE ${wmf2svg_PART=
_SRCS})
 target_link_libraries(calligra_filter_wmf2svg kovectorimage komain koodf)
 =

 install(TARGETS calligra_filter_wmf2svg
-        DESTINATION ${PLUGIN_INSTALL_DIR})
+        DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 install(FILES  calligra_filter_wmf2svg.desktop
         DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
@@ -40,7 +40,7 @@ target_link_libraries(
 )
 =

 install(TARGETS calligra_filter_karbon2wmf
-        DESTINATION ${PLUGIN_INSTALL_DIR})
+        DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 install(FILES  calligra_filter_karbon2wmf.desktop
         DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
diff --git a/filters/karbon/wpg/CMakeLists.txt b/filters/karbon/wpg/CMakeLi=
sts.txt
index 36be32a..e80dd82 100644
--- a/filters/karbon/wpg/CMakeLists.txt
+++ b/filters/karbon/wpg/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(calligra_filter_wpg2svg MODULE ${wpg2svg_PART_S=
RCS})
 =

 target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} $=
{LIBREVENGE_LIBRARIES})
 =

-install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_wpg2svg DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTA=
LL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
diff --git a/filters/karbon/xaml/CMakeLists.txt b/filters/karbon/xaml/CMake=
Lists.txt
index 0c7001e..83625f9 100644
--- a/filters/karbon/xaml/CMakeLists.txt
+++ b/filters/karbon/xaml/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(karbonxamlexport MODULE ${karbonxamlexport_PA=
RT_SRCS})
 =

 target_link_libraries(karbonxamlexport    karboncommon )
 =

-install(TARGETS karbonxamlexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS karbonxamlexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### next target ###############
@@ -27,7 +27,7 @@ add_library(karbonxamlimport MODULE ${karbonxamlimport_PA=
RT_SRCS})
 =

 target_link_libraries(karbonxamlimport    karboncommon )
 =

-install(TARGETS karbonxamlimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS karbonxamlimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/filters/karbon/xfig/CMakeLists.txt b/filters/karbon/xfig/CMake=
Lists.txt
index 3e2dd52..03df63b 100644
--- a/filters/karbon/xfig/CMakeLists.txt
+++ b/filters/karbon/xfig/CMakeLists.txt
@@ -12,7 +12,7 @@ target_link_libraries( calligra_filter_xfig2odg
     komain
 )
 =

-install(TARGETS calligra_filter_xfig2odg  DESTINATION ${PLUGIN_INSTALL_DIR=
} )
+install(TARGETS calligra_filter_xfig2odg  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR} )
 =

 install( FILES  calligra_filter_xfig2odg.desktop DESTINATION ${SERVICES_IN=
STALL_DIR}/calligra )
 =

diff --git a/filters/plan/mpxj/import/CMakeLists.txt b/filters/plan/mpxj/im=
port/CMakeLists.txt
index 192703e..a80e162 100644
--- a/filters/plan/mpxj/import/CMakeLists.txt
+++ b/filters/plan/mpxj/import/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(calligra_filter_mpxj2plan komain)
 # Note: no need to link to ${JNI_LIBRARIES} currently, JNI not used,
 # cmp. "NOTE:" in mpxjimport.cpp
 =

-install(TARGETS calligra_filter_mpxj2plan  DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS calligra_filter_mpxj2plan  DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 =

 install(FILES
     calligra_filter_mpp2plan.desktop
diff --git a/filters/plan/mpxj/planconvert/CMakeLists.txt b/filters/plan/mp=
xj/planconvert/CMakeLists.txt
index 852d576..ee9af30 100644
--- a/filters/plan/mpxj/planconvert/CMakeLists.txt
+++ b/filters/plan/mpxj/planconvert/CMakeLists.txt
@@ -1,5 +1,5 @@
 =

-set (PLANCONVERT_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/planconvert)
+set (PLANCONVERT_INSTALL_DIR ${CALLIGRA_PLUGIN_INSTALL_DIR}/planconvert)
 =

 configure_file (
   "${CMAKE_SOURCE_DIR}/filters/plan/mpxj/planconvert/mpxjconfig.h.in"
diff --git a/filters/sheets/applixspread/CMakeLists.txt b/filters/sheets/ap=
plixspread/CMakeLists.txt
index 6734a1f..9559469 100644
--- a/filters/sheets/applixspread/CMakeLists.txt
+++ b/filters/sheets/applixspread/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(calligra_filter_applixspread2kspread MODULE ${a=
pplixspread2kspread_P
 =

 target_link_libraries(calligra_filter_applixspread2kspread komain calligra=
sheetscommon)
 =

-install(TARGETS calligra_filter_applixspread2kspread  DESTINATION ${PLUGIN=
_INSTALL_DIR})
+install(TARGETS calligra_filter_applixspread2kspread  DESTINATION ${CALLIG=
RA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/filters/sheets/csv/CMakeLists.txt b/filters/sheets/csv/CMakeLi=
sts.txt
index 93ad2f3..a960686 100644
--- a/filters/sheets/csv/CMakeLists.txt
+++ b/filters/sheets/csv/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library(calligra_filter_csv2sheets MODULE ${csv2sheet=
s_PART_SRCS})
 =

 target_link_libraries(calligra_filter_csv2sheets calligrasheetscommon kowi=
dgets)
 =

-install(TARGETS calligra_filter_csv2sheets DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS calligra_filter_csv2sheets DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 =

 install( FILES  calligra_filter_csv2sheets.desktop  DESTINATION ${SERVICES=
_INSTALL_DIR}/calligra)
 =

@@ -28,7 +28,7 @@ add_library(calligra_filter_sheets2csv MODULE ${sheets2cs=
v_PART_SRCS})
 =

 target_link_libraries(calligra_filter_sheets2csv calligrasheetscommon)
 =

-install(TARGETS calligra_filter_sheets2csv  DESTINATION ${PLUGIN_INSTALL_D=
IR})
+install(TARGETS calligra_filter_sheets2csv  DESTINATION ${CALLIGRA_PLUGIN_=
INSTALL_DIR})
 =

 install( FILES  calligra_filter_sheets2csv.desktop  DESTINATION ${SERVICES=
_INSTALL_DIR}/calligra)
 =

diff --git a/filters/sheets/dbase/CMakeLists.txt b/filters/sheets/dbase/CMa=
keLists.txt
index fe8d834..bb0e9d6 100644
--- a/filters/sheets/dbase/CMakeLists.txt
+++ b/filters/sheets/dbase/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(calligra_filter_dbase2kspread MODULE ${dbase2ks=
pread_PART_SRCS})
 =

 target_link_libraries(calligra_filter_dbase2kspread komain)
 =

-install(TARGETS calligra_filter_dbase2kspread  DESTINATION ${PLUGIN_INSTAL=
L_DIR})
+install(TARGETS calligra_filter_dbase2kspread  DESTINATION ${CALLIGRA_PLUG=
IN_INSTALL_DIR})
 =

 install( FILES  calligra_filter_dbase2kspread.desktop  DESTINATION ${SERVI=
CES_INSTALL_DIR}/calligra)
 =

diff --git a/filters/sheets/excel/export/CMakeLists.txt b/filters/sheets/ex=
cel/export/CMakeLists.txt
index f46133a..fb7f9a0 100644
--- a/filters/sheets/excel/export/CMakeLists.txt
+++ b/filters/sheets/excel/export/CMakeLists.txt
@@ -55,7 +55,7 @@ target_link_libraries(calligra_filter_sheets2xls
 set(INSTALL_XLS_EXPORT_FILTER OFF CACHE BOOL "Install the very experimenta=
l xls export filter, which might eat your data and provides no guarentees")
 =

 if(INSTALL_XLS_EXPORT_FILTER)
-  install(TARGETS calligra_filter_sheets2xls  DESTINATION ${PLUGIN_INSTALL=
_DIR})
+  install(TARGETS calligra_filter_sheets2xls  DESTINATION ${CALLIGRA_PLUGI=
N_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/filters/sheets/excel/import/CMakeLists.txt b/filters/sheets/ex=
cel/import/CMakeLists.txt
index 0b1213f..7dccfcf 100644
--- a/filters/sheets/excel/import/CMakeLists.txt
+++ b/filters/sheets/excel/import/CMakeLists.txt
@@ -49,7 +49,7 @@ add_library(excelimport MODULE ${excelimport_PART_SRCS})
 =

 target_link_libraries(excelimport calligrasheetsodf komsooxml komain mso k=
oodf ${ZLIB_LIBRARIES})
 =

-#install(TARGETS excelimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+#install(TARGETS excelimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 set(xls2ods_SRCS ExcelImport.cpp ImportUtils.cpp ODrawClient.cpp ${sidewin=
der_SRCS})
 add_library(calligra_filter_xls2ods MODULE ${xls2ods_SRCS})
@@ -59,7 +59,7 @@ target_link_libraries(calligra_filter_xls2ods
                       komain koodf
                       ${ZLIB_LIBRARIES})
 =

-install(TARGETS calligra_filter_xls2ods DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_xls2ods DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/filters/sheets/gnumeric/CMakeLists.txt b/filters/sheets/gnumer=
ic/CMakeLists.txt
index 4125f4a..90beb1d 100644
--- a/filters/sheets/gnumeric/CMakeLists.txt
+++ b/filters/sheets/gnumeric/CMakeLists.txt
@@ -10,7 +10,7 @@ set(sheets2gnumeric_PART_SRCS gnumericexport.cc )
 add_library(calligra_filter_sheets2gnumeric MODULE ${sheets2gnumeric_PART_=
SRCS})
 target_link_libraries(calligra_filter_sheets2gnumeric calligrasheetscommon=
 kowidgets)
 =

-install(TARGETS calligra_filter_sheets2gnumeric  DESTINATION ${PLUGIN_INST=
ALL_DIR})
+install(TARGETS calligra_filter_sheets2gnumeric  DESTINATION ${CALLIGRA_PL=
UGIN_INSTALL_DIR})
 =

 install( FILES  calligra_filter_sheets2gnumeric.desktop  DESTINATION ${SER=
VICES_INSTALL_DIR}/calligra)
 =

@@ -22,7 +22,7 @@ if(SHOULD_BUILD_FILTER_GNUMERIC_TO_SHEETS)
 set(gnumeric2sheets_PART_SRCS gnumericimport.cc )
 add_library(calligra_filter_gnumeric2sheets MODULE ${gnumeric2sheets_PART_=
SRCS})
 target_link_libraries(calligra_filter_gnumeric2sheets calligrasheetscommon=
 kowidgets)
-install(TARGETS calligra_filter_gnumeric2sheets  DESTINATION ${PLUGIN_INST=
ALL_DIR})
+install(TARGETS calligra_filter_gnumeric2sheets  DESTINATION ${CALLIGRA_PL=
UGIN_INSTALL_DIR})
 =

 install( FILES  calligra_filter_gnumeric2sheets.desktop  DESTINATION ${SER=
VICES_INSTALL_DIR}/calligra)
 =

diff --git a/filters/sheets/html/CMakeLists.txt b/filters/sheets/html/CMake=
Lists.txt
index 7855f73..86fe689 100644
--- a/filters/sheets/html/CMakeLists.txt
+++ b/filters/sheets/html/CMakeLists.txt
@@ -10,7 +10,7 @@ if(SHOULD_BUILD_FILTER_HTML_TO_ODS)
 set(html2ods_PART_SRCS htmlimport.cc )
 add_library(calligra_filter_html2ods MODULE ${html2ods_PART_SRCS})
 target_link_libraries(calligra_filter_html2ods komain KF5::KHtml)
-install(TARGETS calligra_filter_html2ods  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS calligra_filter_html2ods  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 install( FILES  calligra_filter_html2ods.desktop  DESTINATION ${SERVICES_I=
NSTALL_DIR}/calligra)
 =

 endif()
@@ -22,7 +22,7 @@ set(sheets2html_PART_SRCS htmlexport.cc exportdialog.cc )
 ki18n_wrap_ui(sheets2html_PART_SRCS exportwidget.ui )
 add_library(calligra_filter_sheets2html MODULE ${sheets2html_PART_SRCS})
 target_link_libraries(calligra_filter_sheets2html calligrasheetscommon)
-install(TARGETS calligra_filter_sheets2html  DESTINATION ${PLUGIN_INSTALL_=
DIR})
+install(TARGETS calligra_filter_sheets2html  DESTINATION ${CALLIGRA_PLUGIN=
_INSTALL_DIR})
 install( FILES  calligra_filter_sheets2html.desktop  DESTINATION ${SERVICE=
S_INSTALL_DIR}/calligra)
 =

 endif()
diff --git a/filters/sheets/latex/export/CMakeLists.txt b/filters/sheets/la=
tex/export/CMakeLists.txt
index aca21c1..9c15faa 100644
--- a/filters/sheets/latex/export/CMakeLists.txt
+++ b/filters/sheets/latex/export/CMakeLists.txt
@@ -27,7 +27,7 @@ add_library(calligra_filter_kspread2tex MODULE ${kspread2=
tex_PART_SRCS})
 =

 target_link_libraries(calligra_filter_kspread2tex komain)
 =

-install(TARGETS calligra_filter_kspread2tex  DESTINATION ${PLUGIN_INSTALL_=
DIR})
+install(TARGETS calligra_filter_kspread2tex  DESTINATION ${CALLIGRA_PLUGIN=
_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/filters/sheets/opencalc/CMakeLists.txt b/filters/sheets/openca=
lc/CMakeLists.txt
index 43b1fe5..e02a3a7 100644
--- a/filters/sheets/opencalc/CMakeLists.txt
+++ b/filters/sheets/opencalc/CMakeLists.txt
@@ -12,7 +12,7 @@ add_library(calligra_filter_opencalc2sheets MODULE ${open=
calc2sheets_PART_SRCS})
 =

 target_link_libraries(calligra_filter_opencalc2sheets calligrasheetscommon=
 kowidgets)
 =

-install(TARGETS calligra_filter_opencalc2sheets  DESTINATION ${PLUGIN_INST=
ALL_DIR})
+install(TARGETS calligra_filter_opencalc2sheets  DESTINATION ${CALLIGRA_PL=
UGIN_INSTALL_DIR})
 =

 install( FILES  calligra_filter_opencalc2sheets.desktop  DESTINATION ${SER=
VICES_INSTALL_DIR}/calligra)
 =

@@ -27,7 +27,7 @@ add_library(calligra_filter_sheets2opencalc MODULE ${shee=
ts2opencalc_PART_SRCS})
 =

 target_link_libraries(calligra_filter_sheets2opencalc calligrasheetscommon)
 =

-install(TARGETS calligra_filter_sheets2opencalc  DESTINATION ${PLUGIN_INST=
ALL_DIR})
+install(TARGETS calligra_filter_sheets2opencalc  DESTINATION ${CALLIGRA_PL=
UGIN_INSTALL_DIR})
 =

 install( FILES  calligra_filter_sheets2opencalc.desktop  DESTINATION ${SER=
VICES_INSTALL_DIR}/calligra)
 =

diff --git a/filters/sheets/qpro/CMakeLists.txt b/filters/sheets/qpro/CMake=
Lists.txt
index 0736fec..85351b5 100644
--- a/filters/sheets/qpro/CMakeLists.txt
+++ b/filters/sheets/qpro/CMakeLists.txt
@@ -20,7 +20,7 @@ add_library(calligra_filter_qpro2sheets MODULE ${qpro2she=
ets_PART_SRCS})
 =

 target_link_libraries(calligra_filter_qpro2sheets calligrasheetscommon)
 =

-install(TARGETS calligra_filter_qpro2sheets  DESTINATION ${PLUGIN_INSTALL_=
DIR})
+install(TARGETS calligra_filter_qpro2sheets  DESTINATION ${CALLIGRA_PLUGIN=
_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/filters/sheets/xlsx/CMakeLists.txt b/filters/sheets/xlsx/CMake=
Lists.txt
index 6471ae6..2bf6135 100644
--- a/filters/sheets/xlsx/CMakeLists.txt
+++ b/filters/sheets/xlsx/CMakeLists.txt
@@ -36,7 +36,7 @@ target_link_libraries(
     calligrasheetscommon
 )
 =

-install(TARGETS calligra_filter_xlsx2ods DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_xlsx2ods DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/filters/stage/keynote/import/CMakeLists.txt b/filters/stage/ke=
ynote/import/CMakeLists.txt
index 5fdbd94..b59c786 100644
--- a/filters/stage/keynote/import/CMakeLists.txt
+++ b/filters/stage/keynote/import/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(calligra_filter_key2odp MODULE ${key2odp_PART=
_SRCS})
 =

 target_link_libraries(calligra_filter_key2odp komain ${LIBREVENGE_LIBRARIE=
S} ${LIBODFGEN_LIBRARIES} ${LIBETONYEK_LIBRARIES})
 =

-install(TARGETS calligra_filter_key2odp DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_key2odp DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 install(FILES calligra_filter_key2odp.desktop DESTINATION ${SERVICES_INSTA=
LL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
diff --git a/filters/stage/kpr2odf/CMakeLists.txt b/filters/stage/kpr2odf/C=
MakeLists.txt
index 067f8cf..5b71574 100644
--- a/filters/stage/kpr2odf/CMakeLists.txt
+++ b/filters/stage/kpr2odf/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(calligra_filter_kpr2odp MODULE ${kpr2odp_PART_S=
RCS})
 =

 target_link_libraries(calligra_filter_kpr2odp komain)
 =

-install(TARGETS calligra_filter_kpr2odp DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_kpr2odp DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 install( FILES  calligra_filter_kpr2odp.desktop  DESTINATION ${SERVICES_IN=
STALL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
diff --git a/filters/stage/powerpoint/CMakeLists.txt b/filters/stage/powerp=
oint/CMakeLists.txt
index 74a9c1a..9c642be 100644
--- a/filters/stage/powerpoint/CMakeLists.txt
+++ b/filters/stage/powerpoint/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(ppttoodp ppttoodplib)
 add_library(calligra_filter_ppt2odp MODULE PowerPointImport.cpp)
 target_link_libraries(calligra_filter_ppt2odp ppttoodplib komain)
 =

-install(TARGETS calligra_filter_ppt2odp  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_ppt2odp  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 install( FILES  calligra_filter_ppt2odp.desktop  DESTINATION ${SERVICES_IN=
STALL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
diff --git a/filters/stage/pptx/CMakeLists.txt b/filters/stage/pptx/CMakeLi=
sts.txt
index 2f4154d..8bc150f 100644
--- a/filters/stage/pptx/CMakeLists.txt
+++ b/filters/stage/pptx/CMakeLists.txt
@@ -32,7 +32,7 @@ target_link_libraries(
     komain
 )
 =

-install(TARGETS calligra_filter_pptx2odp DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_pptx2odp DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/filters/words/applixword/CMakeLists.txt b/filters/words/applix=
word/CMakeLists.txt
index 1ac6065..18216e3 100644
--- a/filters/words/applixword/CMakeLists.txt
+++ b/filters/words/applixword/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(calligra_filter_applixword2odt MODULE ${applixw=
ord2odt_PART_SRCS})
 =

 target_link_libraries(calligra_filter_applixword2odt komain)
 =

-install(TARGETS calligra_filter_applixword2odt  DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS calligra_filter_applixword2odt  DESTINATION ${CALLIGRA_PLU=
GIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/filters/words/ascii/CMakeLists.txt b/filters/words/ascii/CMake=
Lists.txt
index b368f30..a22b1df 100644
--- a/filters/words/ascii/CMakeLists.txt
+++ b/filters/words/ascii/CMakeLists.txt
@@ -12,7 +12,7 @@ set(ascii2words_PART_SRCS
 ki18n_wrap_ui(ascii2words_PART_SRCS ImportDialogUI.ui )
 add_library(calligra_filter_ascii2words MODULE ${ascii2words_PART_SRCS})
 target_link_libraries(calligra_filter_ascii2words komain kotextlayout word=
sprivate)
-install(TARGETS calligra_filter_ascii2words DESTINATION ${PLUGIN_INSTALL_D=
IR})
+install(TARGETS calligra_filter_ascii2words DESTINATION ${CALLIGRA_PLUGIN_=
INSTALL_DIR})
 install( FILES calligra_filter_ascii2words.desktop DESTINATION ${SERVICES_=
INSTALL_DIR}/calligra)
 =

 endif()
@@ -32,7 +32,7 @@ set(odt2ascii_PART_SRCS
 )
 add_library(calligra_filter_odt2ascii MODULE ${odt2ascii_PART_SRCS})
 target_link_libraries(calligra_filter_odt2ascii koodfreader komain koodf k=
oodf2)
-install(TARGETS calligra_filter_odt2ascii DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS calligra_filter_odt2ascii DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 =

 kcoreaddons_desktop_to_json(calligra_filter_odt2ascii calligra_filter_odt2=
ascii.desktop)
 =

diff --git a/filters/words/docx/export/CMakeLists.txt b/filters/words/docx/=
export/CMakeLists.txt
index e65f6d2..65bdd7d 100644
--- a/filters/words/docx/export/CMakeLists.txt
+++ b/filters/words/docx/export/CMakeLists.txt
@@ -21,7 +21,7 @@ set(Odt2Docx_PART_SRCS
 )
 add_library(calligra_filter_odt2docx MODULE ${Odt2Docx_PART_SRCS})
 target_link_libraries(calligra_filter_odt2docx koodfreader komain koodf ko=
odf2)
-install(TARGETS calligra_filter_odt2docx DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_odt2docx DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 install(FILES calligra_filter_odt2docx.desktop DESTINATION ${SERVICES_INST=
ALL_DIR}/calligra)
 =

diff --git a/filters/words/docx/import/CMakeLists.txt b/filters/words/docx/=
import/CMakeLists.txt
index 1ed7dac..6a110a2 100644
--- a/filters/words/docx/import/CMakeLists.txt
+++ b/filters/words/docx/import/CMakeLists.txt
@@ -38,7 +38,7 @@ target_link_libraries(
     komain
 )
 =

-install(TARGETS calligra_filter_docx2odt DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_docx2odt DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 =

 ########### next target ###############
@@ -58,7 +58,7 @@ target_link_libraries(
     koodf
 )
 =

-install(TARGETS docxexport DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS docxexport DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 endif()
 =

diff --git a/filters/words/epub/CMakeLists.txt b/filters/words/epub/CMakeLi=
sts.txt
index c895c33..c3e2447 100644
--- a/filters/words/epub/CMakeLists.txt
+++ b/filters/words/epub/CMakeLists.txt
@@ -20,7 +20,7 @@ add_library(calligra_filter_odt2epub2 MODULE ${odt2epub2_=
PART_SRCS})
 =

 target_link_libraries(calligra_filter_odt2epub2 kovectorimage komain)
 =

-install(TARGETS calligra_filter_odt2epub2  DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS calligra_filter_odt2epub2  DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 install( FILES  calligra_filter_odt2epub2.desktop  DESTINATION ${SERVICES_=
INSTALL_DIR}/calligra)
 =

 endif()
@@ -41,7 +41,7 @@ add_library(calligra_filter_odt2html MODULE ${odt2html_PA=
RT_SRCS})
 =

 target_link_libraries(calligra_filter_odt2html kovectorimage komain)
 =

-install(TARGETS calligra_filter_odt2html  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS calligra_filter_odt2html  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 install( FILES  calligra_filter_odt2html.desktop  DESTINATION ${SERVICES_I=
NSTALL_DIR}/calligra)
 =

 endif()
diff --git a/filters/words/mobi/CMakeLists.txt b/filters/words/mobi/CMakeLi=
sts.txt
index 4910401..01f6c30 100644
--- a/filters/words/mobi/CMakeLists.txt
+++ b/filters/words/mobi/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(calligra_filter_odt2mobi MODULE ${odt2mobi_PA=
RT_SRCS})
 =

 target_link_libraries(calligra_filter_odt2mobi komain)
 =

-install(TARGETS calligra_filter_odt2mobi  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS calligra_filter_odt2mobi  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 =

 =

 =

diff --git a/filters/words/msword-odf/CMakeLists.txt b/filters/words/msword=
-odf/CMakeLists.txt
index 5d0b332..3d486b5 100644
--- a/filters/words/msword-odf/CMakeLists.txt
+++ b/filters/words/msword-odf/CMakeLists.txt
@@ -26,7 +26,7 @@ add_library(calligra_filter_doc2odt MODULE ${doc2odt_PART=
_SRCS})
 #target_link_libraries(calligra_filter_doc2odt kowv2 komain mso ${ZLIB_LIB=
RARIES})
 target_link_libraries(calligra_filter_doc2odt kowv2 komain mso komsooxml $=
{ZLIB_LIBRARIES})
 =

-install(TARGETS calligra_filter_doc2odt  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_doc2odt  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 install( FILES  calligra_filter_doc2odt.desktop  DESTINATION ${SERVICES_IN=
STALL_DIR}/calligra)
 =

diff --git a/filters/words/rtf/import/CMakeLists.txt b/filters/words/rtf/im=
port/CMakeLists.txt
index 9d3f641..492874b 100644
--- a/filters/words/rtf/import/CMakeLists.txt
+++ b/filters/words/rtf/import/CMakeLists.txt
@@ -8,7 +8,7 @@ set(rtf2odt_PART_SRCS rtfimport.cpp )
 add_library(calligra_filter_rtf2odt MODULE ${rtf2odt_PART_SRCS})
 target_link_libraries(calligra_filter_rtf2odt RtfReader komain)
 =

-install(TARGETS calligra_filter_rtf2odt  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_rtf2odt  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 install( FILES  calligra_filter_rtf2odt.desktop  DESTINATION ${SERVICES_IN=
STALL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
diff --git a/filters/words/wiki/export/CMakeLists.txt b/filters/words/wiki/=
export/CMakeLists.txt
index a2ae332..fc183b2 100644
--- a/filters/words/wiki/export/CMakeLists.txt
+++ b/filters/words/wiki/export/CMakeLists.txt
@@ -11,6 +11,6 @@ set(odt2wiki_PART_SRCS
 )
 add_library(calligra_filter_odt2wiki MODULE ${odt2wiki_PART_SRCS})
 target_link_libraries(calligra_filter_odt2wiki koodfreader komain koodf2)
-install(TARGETS calligra_filter_odt2wiki DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_odt2wiki DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 install( FILES calligra_filter_odt2wiki.desktop DESTINATION ${SERVICES_INS=
TALL_DIR})
diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/word=
s/wordperfect/import/CMakeLists.txt
index 0d64180..2dcd33c 100644
--- a/filters/words/wordperfect/import/CMakeLists.txt
+++ b/filters/words/wordperfect/import/CMakeLists.txt
@@ -19,7 +19,7 @@ add_library(calligra_filter_wpd2odt MODULE ${wpd2odt_PART=
_SRCS})
 target_link_libraries(calligra_filter_wpd2odt
     komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPD_LIBRARI=
ES} ${LIBWPG_LIBRARIES})
 =

-install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_wpd2odt DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 =

 install( FILES calligra_filter_wpd2odt.desktop DESTINATION ${SERVICES_INST=
ALL_DIR}/calligra)
 =

diff --git a/filters/words/works/import/CMakeLists.txt b/filters/words/work=
s/import/CMakeLists.txt
index 66feb99..2e09645 100644
--- a/filters/words/works/import/CMakeLists.txt
+++ b/filters/words/works/import/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(calligra_filter_wps2odt MODULE ${wps2odt_PART=
_SRCS})
 =

 target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES=
} ${LIBREVENGE_LIBRARIES} ${LIBWPS_LIBRARIES})
 =

-install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_filter_wps2odt DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTA=
LL_DIR}/calligra)
 =

 if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL)
diff --git a/flow/part/CMakeLists.txt b/flow/part/CMakeLists.txt
index f76c287..e7423dc 100644
--- a/flow/part/CMakeLists.txt
+++ b/flow/part/CMakeLists.txt
@@ -30,7 +30,7 @@ add_library(flowpart MODULE ${flowpart_PART_SRCS})
 =

 target_link_libraries(flowpart flowprivate)
 =

-install(TARGETS flowpart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS flowpart DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ### kdeinit flow ###
 set(flow_KDEINIT_SRCS main.cpp )
diff --git a/flow/plugins/dockers/CMakeLists.txt b/flow/plugins/dockers/CMa=
keLists.txt
index 420b416..0fdc769 100644
--- a/flow/plugins/dockers/CMakeLists.txt
+++ b/flow/plugins/dockers/CMakeLists.txt
@@ -23,7 +23,7 @@ if(GHNS)
     target_link_libraries(flowdockersplugin KF5::NewStuff)
 endif()
 =

-install(TARGETS flowdockersplugin DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS flowdockersplugin DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 install(FILES flowdockersplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR=
}/calligra)
 install(FILES stencilboxdocker/flow_stencils.knsrc DESTINATION ${CONFIG_IN=
STALL_DIR})
diff --git a/karbon/CMakeLists.txt b/karbon/CMakeLists.txt
index 342859f..2af25ae 100644
--- a/karbon/CMakeLists.txt
+++ b/karbon/CMakeLists.txt
@@ -37,7 +37,7 @@ add_library(karbonpart MODULE ${karbonpart_PART_SRCS})
 =

 target_link_libraries(karbonpart karbonui)
 =

-install(TARGETS karbonpart  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS karbonpart  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### next target ###############
 =

diff --git a/karbon/plugins/filtereffects/CMakeLists.txt b/karbon/plugins/f=
iltereffects/CMakeLists.txt
index a7df522..5aa21b7 100644
--- a/karbon/plugins/filtereffects/CMakeLists.txt
+++ b/karbon/plugins/filtereffects/CMakeLists.txt
@@ -42,6 +42,6 @@ add_library(karbonfiltereffects MODULE ${karbonfiltereffe=
cts_PART_SRCS})
 =

 target_link_libraries(karbonfiltereffects flake kowidgets)
 =

-install(TARGETS karbonfiltereffects  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS karbonfiltereffects  DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
 =

 install( FILES karbonfiltereffects.desktop DESTINATION ${SERVICES_INSTALL_=
DIR}/calligra )
diff --git a/karbon/plugins/flattenpath/CMakeLists.txt b/karbon/plugins/fla=
ttenpath/CMakeLists.txt
index 9defa3a..f0fe4be 100644
--- a/karbon/plugins/flattenpath/CMakeLists.txt
+++ b/karbon/plugins/flattenpath/CMakeLists.txt
@@ -12,7 +12,7 @@ add_library(karbon_flattenpathplugin MODULE ${karbon_flat=
tenpathplugin_PART_SRCS
 =

 target_link_libraries(karbon_flattenpathplugin karboncommon)
 =

-install(TARGETS karbon_flattenpathplugin  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS karbon_flattenpathplugin  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/karbon/plugins/refinepath/CMakeLists.txt b/karbon/plugins/refi=
nepath/CMakeLists.txt
index 3a30746..da1aea3 100644
--- a/karbon/plugins/refinepath/CMakeLists.txt
+++ b/karbon/plugins/refinepath/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(karbon_refinepathplugin MODULE ${karbon_refinep=
athplugin_PART_SRCS})
 =

 target_link_libraries(karbon_refinepathplugin karboncommon)
 =

-install(TARGETS karbon_refinepathplugin  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS karbon_refinepathplugin  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/karbon/plugins/roundcorners/CMakeLists.txt b/karbon/plugins/ro=
undcorners/CMakeLists.txt
index b6d508b..d797bb3 100644
--- a/karbon/plugins/roundcorners/CMakeLists.txt
+++ b/karbon/plugins/roundcorners/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(karbon_roundcornersplugin MODULE ${karbon_rou=
ndcornersplugin_PART_SR
 =

 target_link_libraries(karbon_roundcornersplugin karboncommon)
 =

-install(TARGETS karbon_roundcornersplugin  DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS karbon_roundcornersplugin  DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/karbon/plugins/tools/CMakeLists.txt b/karbon/plugins/tools/CMa=
keLists.txt
index f53f56c..05cb6cc 100644
--- a/karbon/plugins/tools/CMakeLists.txt
+++ b/karbon/plugins/tools/CMakeLists.txt
@@ -47,7 +47,7 @@ add_library(karbontools MODULE ${karbon_tools_PART_SRCS})
 =

 target_link_libraries(karbontools karboncommon karbonui kowidgets)
 =

-install(TARGETS karbontools DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS karbontools DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ecm_install_icons( ${DATA_INSTALL_DIR}/calligra/icons  )
 =

diff --git a/karbon/plugins/whirlpinch/CMakeLists.txt b/karbon/plugins/whir=
lpinch/CMakeLists.txt
index 6458e22..529bb7c 100644
--- a/karbon/plugins/whirlpinch/CMakeLists.txt
+++ b/karbon/plugins/whirlpinch/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(karbon_whirlpinchplugin MODULE ${karbon_whirlpi=
nchplugin_PART_SRCS})
 =

 target_link_libraries(karbon_whirlpinchplugin karboncommon)
 =

-install(TARGETS karbon_whirlpinchplugin  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS karbon_whirlpinchplugin  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/kexi/formeditor/factories/CMakeLists.txt b/kexi/formeditor/fac=
tories/CMakeLists.txt
index b167127..1a28dda 100644
--- a/kexi/formeditor/factories/CMakeLists.txt
+++ b/kexi/formeditor/factories/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(
     Qt5::Xml
     )
 =

-install(TARGETS kformdesigner_containers  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS kformdesigner_containers  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 =

 =

 ########### next target ###############
@@ -43,7 +43,7 @@ target_link_libraries(
     Qt5::Xml
 )
 =

-install(TARGETS kformdesigner_stdwidgets  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS kformdesigner_stdwidgets  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/kexi/migration/mdb/src/CMakeLists.txt b/kexi/migration/mdb/src=
/CMakeLists.txt
index 24e55d8..5c3edea 100644
--- a/kexi/migration/mdb/src/CMakeLists.txt
+++ b/kexi/migration/mdb/src/CMakeLists.txt
@@ -51,7 +51,7 @@ kexiutils
 Predicate
 )
 =

-install(TARGETS keximigrate_mdb  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS keximigrate_mdb  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/kexi/migration/mysql/CMakeLists.txt b/kexi/migration/mysql/CMa=
keLists.txt
index 5bed8ba..f7e6e4c 100644
--- a/kexi/migration/mysql/CMakeLists.txt
+++ b/kexi/migration/mysql/CMakeLists.txt
@@ -18,7 +18,7 @@ target_link_libraries(
     ${MYSQL_LIBRARIES}
     )
 =

-install(TARGETS keximigrate_mysql  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS keximigrate_mysql  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/kexi/migration/pqxx/CMakeLists.txt b/kexi/migration/pqxx/CMake=
Lists.txt
index a58355d..12c742f 100644
--- a/kexi/migration/pqxx/CMakeLists.txt
+++ b/kexi/migration/pqxx/CMakeLists.txt
@@ -21,7 +21,7 @@ target_link_libraries(
     Predicate
 )
 =

-install(TARGETS keximigrate_pqxx  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS keximigrate_pqxx  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/kexi/migration/sybase/CMakeLists.txt b/kexi/migration/sybase/C=
MakeLists.txt
index 23141cb..9fc2a2f 100644
--- a/kexi/migration/sybase/CMakeLists.txt
+++ b/kexi/migration/sybase/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library(keximigrate_sybase MODULE ${keximigrate_sybas=
e_PART_SRCS})
 target_link_libraries(keximigrate_sybase ${FreeTDS_LIBRARIES} =

                       kexiutils keximigrate Predicate)
 =

-install(TARGETS keximigrate_sybase  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS keximigrate_sybase  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/kexi/migration/txt/CMakeLists.txt b/kexi/migration/txt/CMakeLi=
sts.txt
index dd7af62..6eff802 100644
--- a/kexi/migration/txt/CMakeLists.txt
+++ b/kexi/migration/txt/CMakeLists.txt
@@ -19,7 +19,7 @@ target_link_libraries(keximigrate_txt
     Predicate
 )
 =

-install(TARGETS keximigrate_txt  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS keximigrate_txt  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/kexi/migration/xbase/CMakeLists.txt b/kexi/migration/xbase/CMa=
keLists.txt
index 84d4fe8..27abbca 100644
--- a/kexi/migration/xbase/CMakeLists.txt
+++ b/kexi/migration/xbase/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(
     ${XBase_LIBRARIES}
     )
 =

-install(TARGETS keximigrate_xbase DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS keximigrate_xbase DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/kexi/plugins/forms/CMakeLists.txt b/kexi/plugins/forms/CMakeLi=
sts.txt
index 19b85d6..2d464ce 100644
--- a/kexi/plugins/forms/CMakeLists.txt
+++ b/kexi/plugins/forms/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(
     KProperty
 )
 =

-install(TARGETS kexihandler_form  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kexihandler_form  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### next target ###############
@@ -59,7 +59,7 @@ target_link_libraries(
     Qt5::Gui
     )
 =

-install(TARGETS kformdesigner_kexidbwidgets  DESTINATION ${PLUGIN_INSTALL_=
DIR})
+install(TARGETS kformdesigner_kexidbwidgets  DESTINATION ${CALLIGRA_PLUGIN=
_INSTALL_DIR})
 =

 =

 ########### next target ###############
diff --git a/kexi/plugins/forms/widgets/mapbrowser/CMakeLists.txt b/kexi/pl=
ugins/forms/widgets/mapbrowser/CMakeLists.txt
index e0e6f95..8763e9c 100644
--- a/kexi/plugins/forms/widgets/mapbrowser/CMakeLists.txt
+++ b/kexi/plugins/forms/widgets/mapbrowser/CMakeLists.txt
@@ -35,7 +35,7 @@ target_link_libraries(
     Qt5::Xml
     )
 =

-install(TARGETS kformdesigner_mapbrowser  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS kformdesigner_mapbrowser  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/kexi/plugins/forms/widgets/webbrowser/CMakeLists.txt b/kexi/pl=
ugins/forms/widgets/webbrowser/CMakeLists.txt
index e93a8d5..3d799dc 100644
--- a/kexi/plugins/forms/widgets/webbrowser/CMakeLists.txt
+++ b/kexi/plugins/forms/widgets/webbrowser/CMakeLists.txt
@@ -29,7 +29,7 @@ target_link_libraries(
 )
 =

 =

-install(TARGETS kformdesigner_webbrowser  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS kformdesigner_webbrowser  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/kexi/plugins/importexport/csv/CMakeLists.txt b/kexi/plugins/im=
portexport/csv/CMakeLists.txt
index c330819..f9e82c1 100644
--- a/kexi/plugins/importexport/csv/CMakeLists.txt
+++ b/kexi/plugins/importexport/csv/CMakeLists.txt
@@ -32,7 +32,7 @@ if(MSVC)
    set_target_properties(kexihandler_csv_importexport PROPERTIES LINK_FLAG=
S /FORCE:MULTIPLE)
 endif()
 =

-install(TARGETS kexihandler_csv_importexport  DESTINATION ${PLUGIN_INSTALL=
_DIR})
+install(TARGETS kexihandler_csv_importexport  DESTINATION ${CALLIGRA_PLUGI=
N_INSTALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/kexi/plugins/migration/CMakeLists.txt b/kexi/plugins/migration=
/CMakeLists.txt
index 9273fa7..6d8f530 100644
--- a/kexi/plugins/migration/CMakeLists.txt
+++ b/kexi/plugins/migration/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(kexihandler_migration MODULE ${kexihandler_mi=
gration_PART_SRCS})
 =

 target_link_libraries(kexihandler_migration   kexicore keximigrate )
 =

-install(TARGETS kexihandler_migration  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kexihandler_migration  DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
 =

 =

 ########### install files ###############
diff --git a/kexi/plugins/queries/CMakeLists.txt b/kexi/plugins/queries/CMa=
keLists.txt
index 450c069..e559077 100644
--- a/kexi/plugins/queries/CMakeLists.txt
+++ b/kexi/plugins/queries/CMakeLists.txt
@@ -30,7 +30,7 @@ target_link_libraries(
     Qt5::Xml
 )
 =

-install(TARGETS kexihandler_query  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kexihandler_query  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/kexi/plugins/reports/CMakeLists.txt b/kexi/plugins/reports/CMa=
keLists.txt
index 633fc6c..e328f6d 100644
--- a/kexi/plugins/reports/CMakeLists.txt
+++ b/kexi/plugins/reports/CMakeLists.txt
@@ -54,5 +54,5 @@ else ()
     )
 endif ()
 =

-install(TARGETS kexihandler_report DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kexihandler_report DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 install(FILES kexireporthandler.desktop DESTINATION ${SERVICES_INSTALL_DIR=
}/calligra)
diff --git a/kexi/plugins/scripting/kexidb/CMakeLists.txt b/kexi/plugins/sc=
ripting/kexidb/CMakeLists.txt
index c6cb5f3..1d694a9 100644
--- a/kexi/plugins/scripting/kexidb/CMakeLists.txt
+++ b/kexi/plugins/scripting/kexidb/CMakeLists.txt
@@ -14,4 +14,4 @@ set(krossmodulekexidb_PART_SRCS
 add_library(krossmodulekexidb MODULE ${krossmodulekexidb_PART_SRCS})
 =

 target_link_libraries(krossmodulekexidb Predicate)
-install(TARGETS krossmodulekexidb DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS krossmodulekexidb DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
diff --git a/kexi/plugins/scripting/kexiscripting/CMakeLists.txt b/kexi/plu=
gins/scripting/kexiscripting/CMakeLists.txt
index bd554ac..59081b2 100644
--- a/kexi/plugins/scripting/kexiscripting/CMakeLists.txt
+++ b/kexi/plugins/scripting/kexiscripting/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(
     KF5::KIOWidgets
     Qt5::Gui
 )
-install(TARGETS kexihandler_script  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kexihandler_script  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 ########### install files ###############
 =

diff --git a/kexi/plugins/shapes/relationdesign/CMakeLists.txt b/kexi/plugi=
ns/shapes/relationdesign/CMakeLists.txt
index ce5bdb2..4bb4dc6 100644
--- a/kexi/plugins/shapes/relationdesign/CMakeLists.txt
+++ b/kexi/plugins/shapes/relationdesign/CMakeLists.txt
@@ -24,6 +24,6 @@ Qt5::Core
 Qt5::Gui
 )
 =

-install(TARGETS kexirelationdesignshape  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kexirelationdesignshape  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 install( FILES kexirelationdesignshape.desktop DESTINATION ${SERVICES_INST=
ALL_DIR}/calligra )
 =

diff --git a/kexi/plugins/tables/CMakeLists.txt b/kexi/plugins/tables/CMake=
Lists.txt
index 6ce2094..7625685 100644
--- a/kexi/plugins/tables/CMakeLists.txt
+++ b/kexi/plugins/tables/CMakeLists.txt
@@ -28,7 +28,7 @@ target_link_libraries(
     Qt5::Gui
 )
 =

-install(TARGETS kexihandler_table  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kexihandler_table  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/assistants/RulerAssistant/CMakeLists.txt b/krita=
/plugins/assistants/RulerAssistant/CMakeLists.txt
index c477cd3..ec1efb9 100644
--- a/krita/plugins/assistants/RulerAssistant/CMakeLists.txt
+++ b/krita/plugins/assistants/RulerAssistant/CMakeLists.txt
@@ -20,7 +20,7 @@ kcoreaddons_desktop_to_json(kritarulerassistanttool krita=
rulerassistanttool.desk
 =

 target_link_libraries(kritarulerassistanttool kritaui flake   )
 =

-install(TARGETS kritarulerassistanttool  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritarulerassistanttool  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/colorspaces/extensions/CMakeLists.txt b/krita/pl=
ugins/colorspaces/extensions/CMakeLists.txt
index f3bcfb7..f3aaf99 100644
--- a/krita/plugins/colorspaces/extensions/CMakeLists.txt
+++ b/krita/plugins/colorspaces/extensions/CMakeLists.txt
@@ -15,7 +15,7 @@ add_library(krita_colorspaces_extensions MODULE ${extensi=
ons_plugin_PART_SRCS} )
 =

 target_link_libraries(krita_colorspaces_extensions pigmentcms ${OPENEXR_LI=
BRARIES})
 =

-install( TARGETS krita_colorspaces_extensions DESTINATION ${PLUGIN_INSTALL=
_DIR} )
+install( TARGETS krita_colorspaces_extensions DESTINATION ${CALLIGRA_PLUGI=
N_INSTALL_DIR} )
 =

 ########### install files ###############
 =

diff --git a/krita/plugins/extensions/bigbrother/CMakeLists.txt b/krita/plu=
gins/extensions/bigbrother/CMakeLists.txt
index a709401..1680cf4 100644
--- a/krita/plugins/extensions/bigbrother/CMakeLists.txt
+++ b/krita/plugins/extensions/bigbrother/CMakeLists.txt
@@ -13,7 +13,7 @@ kcoreaddons_desktop_to_json(kritabigbrother kritabigbroth=
er.desktop)
 =

 target_link_libraries(kritabigbrother kritaui)
 =

-install(TARGETS kritabigbrother  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritabigbrother  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/clonesarray/CMakeLists.txt b/krita/pl=
ugins/extensions/clonesarray/CMakeLists.txt
index 6d99cc1..643a4c1 100644
--- a/krita/plugins/extensions/clonesarray/CMakeLists.txt
+++ b/krita/plugins/extensions/clonesarray/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(kritaclonesarray MODULE ${kritaclonesarray_PA=
RT_SRCS})
 kcoreaddons_desktop_to_json(kritaclonesarray kritaclonesarray.desktop)
 =

 target_link_libraries(kritaclonesarray kritaui)
-install(TARGETS kritaclonesarray  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaclonesarray  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 ########### install files ###############
 =

diff --git a/krita/plugins/extensions/colorrange/CMakeLists.txt b/krita/plu=
gins/extensions/colorrange/CMakeLists.txt
index d34a368..6057a8c 100644
--- a/krita/plugins/extensions/colorrange/CMakeLists.txt
+++ b/krita/plugins/extensions/colorrange/CMakeLists.txt
@@ -10,7 +10,7 @@ kcoreaddons_desktop_to_json(kritacolorrange kritacolorran=
ge.desktop)
 =

 target_link_libraries(kritacolorrange kritaui)
 =

-install(TARGETS kritacolorrange  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritacolorrange  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/colorspaceconversion/CMakeLists.txt b=
/krita/plugins/extensions/colorspaceconversion/CMakeLists.txt
index d4c45e7..2add11d 100644
--- a/krita/plugins/extensions/colorspaceconversion/CMakeLists.txt
+++ b/krita/plugins/extensions/colorspaceconversion/CMakeLists.txt
@@ -10,7 +10,7 @@ kcoreaddons_desktop_to_json(kritacolorspaceconversion kri=
tacolorspaceconversion.
 =

 target_link_libraries(kritacolorspaceconversion kritaui)
 =

-install(TARGETS kritacolorspaceconversion  DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS kritacolorspaceconversion  DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/advancedcolorselector/CMakeLi=
sts.txt b/krita/plugins/extensions/dockers/advancedcolorselector/CMakeLists=
.txt
index 2b0459a..38134b0 100644
--- a/krita/plugins/extensions/dockers/advancedcolorselector/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/advancedcolorselector/CMakeLists.txt
@@ -36,7 +36,7 @@ kcoreaddons_desktop_to_json(kritacolorselectorng krita_co=
lorselectorng.desktop)
 =

 target_link_libraries(kritacolorselectorng kritaui)
 =

-install(TARGETS kritacolorselectorng  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritacolorselectorng  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/artisticcolorselector/CMakeLi=
sts.txt b/krita/plugins/extensions/dockers/artisticcolorselector/CMakeLists=
.txt
index 36c33d4..2c1159e 100644
--- a/krita/plugins/extensions/dockers/artisticcolorselector/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/artisticcolorselector/CMakeLists.txt
@@ -12,5 +12,5 @@ kcoreaddons_desktop_to_json(kritaartisticcolorselector kr=
ita_artisticcolorselect
 =

 target_link_libraries(kritaartisticcolorselector kritaui)
 =

-install(TARGETS kritaartisticcolorselector DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS kritaartisticcolorselector DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 install(FILES krita_artisticcolorselector.desktop DESTINATION ${SERVICES_I=
NSTALL_DIR}/calligra)
diff --git a/krita/plugins/extensions/dockers/channeldocker/CMakeLists.txt =
b/krita/plugins/extensions/dockers/channeldocker/CMakeLists.txt
index 5fc346a..76c7451 100644
--- a/krita/plugins/extensions/dockers/channeldocker/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/channeldocker/CMakeLists.txt
@@ -6,7 +6,7 @@ kcoreaddons_desktop_to_json(kritachanneldocker krita_channe=
ldocker.desktop)
 =

 target_link_libraries(kritachanneldocker kritaui)
 =

-install(TARGETS kritachanneldocker  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritachanneldocker  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/colorslider/CMakeLists.txt b/=
krita/plugins/extensions/dockers/colorslider/CMakeLists.txt
index b5b3685..e4f495e 100644
--- a/krita/plugins/extensions/dockers/colorslider/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/colorslider/CMakeLists.txt
@@ -15,7 +15,7 @@ kcoreaddons_desktop_to_json(kritacolorslider krita_colors=
lider.desktop)
 =

 target_link_libraries(kritacolorslider kritaui ${OPENEXR_LIBRARIES})
 =

-install(TARGETS kritacolorslider  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritacolorslider  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/compositiondocker/CMakeLists.=
txt b/krita/plugins/extensions/dockers/compositiondocker/CMakeLists.txt
index ba01bc5..ed413f4 100644
--- a/krita/plugins/extensions/dockers/compositiondocker/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/compositiondocker/CMakeLists.txt
@@ -9,7 +9,7 @@ kcoreaddons_desktop_to_json(kritacompositiondocker krita_co=
mpositiondocker.deskt
 =

 target_link_libraries(kritacompositiondocker ${KDE4_KFILE_LIBRARY} kritaui)
 =

-install(TARGETS kritacompositiondocker  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritacompositiondocker  DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/defaultdockers/CMakeLists.txt=
 b/krita/plugins/extensions/dockers/defaultdockers/CMakeLists.txt
index 9a801db..e3054c2 100644
--- a/krita/plugins/extensions/dockers/defaultdockers/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/defaultdockers/CMakeLists.txt
@@ -18,7 +18,7 @@ kcoreaddons_desktop_to_json(kritadefaultdockers kritadefa=
ultdockers.desktop)
 =

 target_link_libraries(kritadefaultdockers kritaui)
 =

-install(TARGETS kritadefaultdockers  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritadefaultdockers  DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
 =

 install( FILES  kritadefaultdockers.desktop  DESTINATION ${SERVICES_INSTAL=
L_DIR}/calligra)
 =

diff --git a/krita/plugins/extensions/dockers/digitalmixer/CMakeLists.txt b=
/krita/plugins/extensions/dockers/digitalmixer/CMakeLists.txt
index 87f570b..f1fd2be 100644
--- a/krita/plugins/extensions/dockers/digitalmixer/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/digitalmixer/CMakeLists.txt
@@ -8,7 +8,7 @@ kcoreaddons_desktop_to_json(kritadigitalmixer krita_digital=
mixer.desktop)
 =

 target_link_libraries(kritadigitalmixer kritaui)
 =

-install(TARGETS kritadigitalmixer  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritadigitalmixer  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/historydocker/CMakeLists.txt =
b/krita/plugins/extensions/dockers/historydocker/CMakeLists.txt
index f81b612..badd697 100644
--- a/krita/plugins/extensions/dockers/historydocker/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/historydocker/CMakeLists.txt
@@ -16,6 +16,6 @@ kcoreaddons_desktop_to_json(kritahistorydocker kritahisto=
rydocker.desktop)
 =

 target_link_libraries(kritahistorydocker kritaimage kritaui)
 =

-install(TARGETS kritahistorydocker  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritahistorydocker  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 install( FILES kritahistorydocker.desktop DESTINATION ${SERVICES_INSTALL_D=
IR}/calligra )
diff --git a/krita/plugins/extensions/dockers/imagedocker/CMakeLists.txt b/=
krita/plugins/extensions/dockers/imagedocker/CMakeLists.txt
index 1e9c381..5a16140 100644
--- a/krita/plugins/extensions/dockers/imagedocker/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/imagedocker/CMakeLists.txt
@@ -13,5 +13,5 @@ kcoreaddons_desktop_to_json(kritaimagedocker kritaimagedo=
cker.desktop)
 =

 target_link_libraries(kritaimagedocker kritaui)
 =

-install(TARGETS kritaimagedocker DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaimagedocker DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 install(FILES kritaimagedocker.desktop DESTINATION ${SERVICES_INSTALL_DIR}=
/calligra)
diff --git a/krita/plugins/extensions/dockers/lut/CMakeLists.txt b/krita/pl=
ugins/extensions/dockers/lut/CMakeLists.txt
index 302fe50..63d66d0 100644
--- a/krita/plugins/extensions/dockers/lut/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/lut/CMakeLists.txt
@@ -29,7 +29,7 @@ if(HAVE_OPENGL)
 endif()
 =

 =

-install(TARGETS kritalutdocker  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritalutdocker  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/overview/CMakeLists.txt b/kri=
ta/plugins/extensions/dockers/overview/CMakeLists.txt
index d3bdcd4..10999fa 100644
--- a/krita/plugins/extensions/dockers/overview/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/overview/CMakeLists.txt
@@ -5,7 +5,7 @@ kcoreaddons_desktop_to_json(kritaoverviewdocker krita_overv=
iewdocker.desktop)
 =

 target_link_libraries(kritaoverviewdocker kritaui)
 =

-install(TARGETS kritaoverviewdocker  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaoverviewdocker  DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/palettedocker/CMakeLists.txt =
b/krita/plugins/extensions/dockers/palettedocker/CMakeLists.txt
index b681f4a..87088c2 100644
--- a/krita/plugins/extensions/dockers/palettedocker/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/palettedocker/CMakeLists.txt
@@ -10,7 +10,7 @@ kcoreaddons_desktop_to_json(kritapalettedocker krita_pale=
ttedocker.desktop)
 =

 target_link_libraries(kritapalettedocker kritaui)
 =

-install(TARGETS kritapalettedocker  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapalettedocker  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/patterndocker/CMakeLists.txt =
b/krita/plugins/extensions/dockers/patterndocker/CMakeLists.txt
index 94b72b5..c006f0d 100644
--- a/krita/plugins/extensions/dockers/patterndocker/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/patterndocker/CMakeLists.txt
@@ -6,7 +6,7 @@ kcoreaddons_desktop_to_json(kritapatterndocker krita_patter=
ndocker.desktop)
 =

 target_link_libraries(kritapatterndocker kritaui)
 =

-install(TARGETS kritapatterndocker  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapatterndocker  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/presetdocker/CMakeLists.txt b=
/krita/plugins/extensions/dockers/presetdocker/CMakeLists.txt
index eabf906..f1078d9 100644
--- a/krita/plugins/extensions/dockers/presetdocker/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/presetdocker/CMakeLists.txt
@@ -6,7 +6,7 @@ kcoreaddons_desktop_to_json(kritapresetdocker krita_presetd=
ocker.desktop)
 =

 target_link_libraries(kritapresetdocker kritaui)
 =

-install(TARGETS kritapresetdocker  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapresetdocker  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/smallcolorselector/CMakeLists=
.txt b/krita/plugins/extensions/dockers/smallcolorselector/CMakeLists.txt
index e7167db..1b71ba4 100644
--- a/krita/plugins/extensions/dockers/smallcolorselector/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/smallcolorselector/CMakeLists.txt
@@ -8,7 +8,7 @@ kcoreaddons_desktop_to_json(kritasmallcolorselector krita_s=
mallcolorselector.des
 =

 target_link_libraries(kritasmallcolorselector kritaui)
 =

-install(TARGETS kritasmallcolorselector  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritasmallcolorselector  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/specificcolorselector/CMakeLi=
sts.txt b/krita/plugins/extensions/dockers/specificcolorselector/CMakeLists=
.txt
index d738e50..4147825 100644
--- a/krita/plugins/extensions/dockers/specificcolorselector/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/specificcolorselector/CMakeLists.txt
@@ -8,7 +8,7 @@ kcoreaddons_desktop_to_json(kritaspecificcolorselector krit=
a_specificcolorselect
 =

 target_link_libraries(kritaspecificcolorselector kritaui ${OPENEXR_LIBRARI=
ES})
 =

-install(TARGETS kritaspecificcolorselector  DESTINATION ${PLUGIN_INSTALL_D=
IR})
+install(TARGETS kritaspecificcolorselector  DESTINATION ${CALLIGRA_PLUGIN_=
INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dockers/tasksetdocker/CMakeLists.txt =
b/krita/plugins/extensions/dockers/tasksetdocker/CMakeLists.txt
index 766a3ec..2fc7903 100644
--- a/krita/plugins/extensions/dockers/tasksetdocker/CMakeLists.txt
+++ b/krita/plugins/extensions/dockers/tasksetdocker/CMakeLists.txt
@@ -9,7 +9,7 @@ kcoreaddons_desktop_to_json(kritatasksetdocker krita_taskse=
tdocker.desktop)
 =

 target_link_libraries(kritatasksetdocker kritaui)
 =

-install(TARGETS kritatasksetdocker  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatasksetdocker  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/dropshadow/CMakeLists.txt b/krita/plu=
gins/extensions/dropshadow/CMakeLists.txt
index 0d154e7..09ed376 100644
--- a/krita/plugins/extensions/dropshadow/CMakeLists.txt
+++ b/krita/plugins/extensions/dropshadow/CMakeLists.txt
@@ -10,7 +10,7 @@ kcoreaddons_desktop_to_json(kritadropshadow kritadropshad=
ow.desktop)
 =

 target_link_libraries(kritadropshadow kritaui)
 =

-install(TARGETS kritadropshadow  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritadropshadow  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/gmic/CMakeLists.txt b/krita/plugins/e=
xtensions/gmic/CMakeLists.txt
index a2f9045..690438e 100644
--- a/krita/plugins/extensions/gmic/CMakeLists.txt
+++ b/krita/plugins/extensions/gmic/CMakeLists.txt
@@ -171,7 +171,7 @@ target_link_libraries(gmicparser Qt5::Core Qt5::Gui kri=
taui gmic ${ZLIB_LIBRARIE
 ########### install files ###############
 set(GMIC_INSTALL_DIR ${DATA_INSTALL_DIR}/krita/gmic)
 =

-install(TARGETS kritagmic  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritagmic  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 install(TARGETS gmicparser  ${INSTALL_TARGETS_DEFAULT_ARGS})
 =

 install( FILES  gmic.rc DESTINATION ${DATA_INSTALL_DIR}/kritaplugins)
diff --git a/krita/plugins/extensions/histogram/CMakeLists.txt b/krita/plug=
ins/extensions/histogram/CMakeLists.txt
index f1a697e..ed263a6 100644
--- a/krita/plugins/extensions/histogram/CMakeLists.txt
+++ b/krita/plugins/extensions/histogram/CMakeLists.txt
@@ -10,7 +10,7 @@ kcoreaddons_desktop_to_json(kritahistogram kritahistogram=
.desktop)
 =

 target_link_libraries(kritahistogram kritaui)
 =

-install(TARGETS kritahistogram  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritahistogram  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/imagesize/CMakeLists.txt b/krita/plug=
ins/extensions/imagesize/CMakeLists.txt
index 8cd4852..05af163 100644
--- a/krita/plugins/extensions/imagesize/CMakeLists.txt
+++ b/krita/plugins/extensions/imagesize/CMakeLists.txt
@@ -20,7 +20,7 @@ add_library(kritaimagesize MODULE ${kritaimagesize_PART_S=
RCS})
 =

 target_link_libraries(kritaimagesize kritaui)
 =

-install(TARGETS kritaimagesize  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaimagesize  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/krita/plugins/extensions/imagesplit/CMakeLists.txt b/krita/plu=
gins/extensions/imagesplit/CMakeLists.txt
index 1719229..655ed2e 100644
--- a/krita/plugins/extensions/imagesplit/CMakeLists.txt
+++ b/krita/plugins/extensions/imagesplit/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(kritaimagesplit MODULE ${kritaimagesplit_PART=
_SRCS})
 target_link_libraries(kritaimagesplit kritaui)
 kcoreaddons_desktop_to_json(kritaimagesplit kritaimagesplit.desktop)
 =

-install(TARGETS kritaimagesplit  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaimagesplit  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 install( FILES  imagesplit.rc  DESTINATION ${DATA_INSTALL_DIR}/kritaplugin=
s)
 install( FILES  kritaimagesplit.desktop  DESTINATION ${SERVICES_INSTALL_DI=
R}/calligra)
diff --git a/krita/plugins/extensions/layergroupswitcher/CMakeLists.txt b/k=
rita/plugins/extensions/layergroupswitcher/CMakeLists.txt
index 1a2bd3a..f2347cb 100644
--- a/krita/plugins/extensions/layergroupswitcher/CMakeLists.txt
+++ b/krita/plugins/extensions/layergroupswitcher/CMakeLists.txt
@@ -7,5 +7,5 @@ kcoreaddons_desktop_to_json(kritalayergroupswitcher kritala=
yergroupswitcher.desk
 =

 target_link_libraries(kritalayergroupswitcher kritaui)
 =

-install(TARGETS kritalayergroupswitcher  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritalayergroupswitcher  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 install( FILES  kritalayergroupswitcher.desktop  DESTINATION ${SERVICES_IN=
STALL_DIR}/calligra)
diff --git a/krita/plugins/extensions/layersplit/CMakeLists.txt b/krita/plu=
gins/extensions/layersplit/CMakeLists.txt
index 4c178ec..ddb781a 100644
--- a/krita/plugins/extensions/layersplit/CMakeLists.txt
+++ b/krita/plugins/extensions/layersplit/CMakeLists.txt
@@ -13,7 +13,7 @@ kcoreaddons_desktop_to_json(kritalayersplit kritalayerspl=
it.desktop)
 =

 target_link_libraries(kritalayersplit kritaui)
 =

-install(TARGETS kritalayersplit  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritalayersplit  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 install( FILES  layersplit.rc  DESTINATION ${DATA_INSTALL_DIR}/kritaplugin=
s)
 install( FILES  kritalayersplit.desktop  DESTINATION ${SERVICES_INSTALL_DI=
R}/calligra)
diff --git a/krita/plugins/extensions/metadataeditor/CMakeLists.txt b/krita=
/plugins/extensions/metadataeditor/CMakeLists.txt
index 6c1603e..e22d249 100644
--- a/krita/plugins/extensions/metadataeditor/CMakeLists.txt
+++ b/krita/plugins/extensions/metadataeditor/CMakeLists.txt
@@ -12,7 +12,7 @@ kcoreaddons_desktop_to_json(kritametadataeditor kritameta=
dataeditor.desktop)
 =

 target_link_libraries(kritametadataeditor kritaui )
 =

-install(TARGETS kritametadataeditor  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritametadataeditor  DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/modify_selection/CMakeLists.txt b/kri=
ta/plugins/extensions/modify_selection/CMakeLists.txt
index ee78b81..813edaf 100644
--- a/krita/plugins/extensions/modify_selection/CMakeLists.txt
+++ b/krita/plugins/extensions/modify_selection/CMakeLists.txt
@@ -23,7 +23,7 @@ kcoreaddons_desktop_to_json(kritamodifyselection kritamod=
ifyselection.desktop)
 =

 target_link_libraries(kritamodifyselection kritaui)
 =

-install(TARGETS kritamodifyselection  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritamodifyselection  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/offsetimage/CMakeLists.txt b/krita/pl=
ugins/extensions/offsetimage/CMakeLists.txt
index f9a6218..7c93232 100644
--- a/krita/plugins/extensions/offsetimage/CMakeLists.txt
+++ b/krita/plugins/extensions/offsetimage/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(kritaoffsetimage MODULE ${kritaoffsetimage_PART=
_SRCS})
 kcoreaddons_desktop_to_json(kritaoffsetimage kritaoffsetimage.desktop)
 =

 target_link_libraries(kritaoffsetimage kritaui)
-install(TARGETS kritaoffsetimage  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaoffsetimage  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 ########### install files ###############
 =

diff --git a/krita/plugins/extensions/resourcemanager/CMakeLists.txt b/krit=
a/plugins/extensions/resourcemanager/CMakeLists.txt
index 0a44c89..94b71a9 100644
--- a/krita/plugins/extensions/resourcemanager/CMakeLists.txt
+++ b/krita/plugins/extensions/resourcemanager/CMakeLists.txt
@@ -18,7 +18,7 @@ kcoreaddons_desktop_to_json(kritaresourcemanager kritares=
ourcemanager.desktop)
 =

 target_link_libraries(kritaresourcemanager kowidgets kritaui kritalibpaint=
op)
 =

-install(TARGETS kritaresourcemanager  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaresourcemanager  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 install( FILES  resourcemanager.rc  DESTINATION ${DATA_INSTALL_DIR}/kritap=
lugins)
 install( FILES  kritaresourcemanager.desktop  DESTINATION ${SERVICES_INSTA=
LL_DIR}/calligra)
diff --git a/krita/plugins/extensions/rotateimage/CMakeLists.txt b/krita/pl=
ugins/extensions/rotateimage/CMakeLists.txt
index a125e20..c03d878 100644
--- a/krita/plugins/extensions/rotateimage/CMakeLists.txt
+++ b/krita/plugins/extensions/rotateimage/CMakeLists.txt
@@ -16,7 +16,7 @@ kcoreaddons_desktop_to_json(kritarotateimage kritarotatei=
mage.desktop)
 =

 target_link_libraries(kritarotateimage kritaui)
 =

-install(TARGETS kritarotateimage  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritarotateimage  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/extensions/separate_channels/CMakeLists.txt b/kr=
ita/plugins/extensions/separate_channels/CMakeLists.txt
index 8f9acd9..5486ede 100644
--- a/krita/plugins/extensions/separate_channels/CMakeLists.txt
+++ b/krita/plugins/extensions/separate_channels/CMakeLists.txt
@@ -6,6 +6,6 @@ kcoreaddons_desktop_to_json(kritaseparatechannels kritasepa=
ratechannels.desktop)
 =

 target_link_libraries(kritaseparatechannels kritaui)
 =

-install(TARGETS kritaseparatechannels  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaseparatechannels  DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
 install( FILES  imageseparate.rc  DESTINATION ${DATA_INSTALL_DIR}/kritaplu=
gins)
 install( FILES  kritaseparatechannels.desktop  DESTINATION ${SERVICES_INST=
ALL_DIR}/calligra)
diff --git a/krita/plugins/extensions/shearimage/CMakeLists.txt b/krita/plu=
gins/extensions/shearimage/CMakeLists.txt
index 26588c1..4551197 100644
--- a/krita/plugins/extensions/shearimage/CMakeLists.txt
+++ b/krita/plugins/extensions/shearimage/CMakeLists.txt
@@ -10,7 +10,7 @@ kcoreaddons_desktop_to_json(kritashearimage kritashearima=
ge.desktop)
 =

 target_link_libraries(kritashearimage kritaui)
 =

-install(TARGETS kritashearimage  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritashearimage  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/blur/CMakeLists.txt b/krita/plugins/filt=
ers/blur/CMakeLists.txt
index 8e05670..acb58b1 100644
--- a/krita/plugins/filters/blur/CMakeLists.txt
+++ b/krita/plugins/filters/blur/CMakeLists.txt
@@ -25,7 +25,7 @@ add_library(kritablurfilter MODULE ${kritablurfilter_PART=
_SRCS})
 =

 target_link_libraries(kritablurfilter kritaui)
 =

-install(TARGETS kritablurfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritablurfilter  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/colors/CMakeLists.txt b/krita/plugins/fi=
lters/colors/CMakeLists.txt
index 8762aa1..a63f56c 100644
--- a/krita/plugins/filters/colors/CMakeLists.txt
+++ b/krita/plugins/filters/colors/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(kritaextensioncolorsfilters MODULE ${kritaext=
ensioncolorsfilters_PAR
 =

 target_link_libraries(kritaextensioncolorsfilters kritaui)
 =

-install(TARGETS kritaextensioncolorsfilters  DESTINATION ${PLUGIN_INSTALL_=
DIR})
+install(TARGETS kritaextensioncolorsfilters  DESTINATION ${CALLIGRA_PLUGIN=
_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/colorsfilters/CMakeLists.txt b/krita/plu=
gins/filters/colorsfilters/CMakeLists.txt
index a5ba6da..cb65965 100644
--- a/krita/plugins/filters/colorsfilters/CMakeLists.txt
+++ b/krita/plugins/filters/colorsfilters/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(kritacolorsfilters MODULE ${kritacolorsfilter=
s_PART_SRCS})
 =

 target_link_libraries(kritacolorsfilters kritaui)
 =

-install(TARGETS kritacolorsfilters  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritacolorsfilters  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/convolutionfilters/CMakeLists.txt b/krit=
a/plugins/filters/convolutionfilters/CMakeLists.txt
index c2c2de0..71da354 100644
--- a/krita/plugins/filters/convolutionfilters/CMakeLists.txt
+++ b/krita/plugins/filters/convolutionfilters/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(kritaconvolutionfilters MODULE ${kritaconvolu=
tionfilters_PART_SRCS})
 =

 target_link_libraries(kritaconvolutionfilters kritaui)
 =

-install(TARGETS kritaconvolutionfilters  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaconvolutionfilters  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/dodgeburn/CMakeLists.txt b/krita/plugins=
/filters/dodgeburn/CMakeLists.txt
index b0c12e7..89dabbf 100644
--- a/krita/plugins/filters/dodgeburn/CMakeLists.txt
+++ b/krita/plugins/filters/dodgeburn/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(kritadodgeburn MODULE ${kritadodgeburn_PART_S=
RCS})
 =

 target_link_libraries(kritadodgeburn kritaui)
 =

-install(TARGETS kritadodgeburn  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritadodgeburn  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/embossfilter/CMakeLists.txt b/krita/plug=
ins/filters/embossfilter/CMakeLists.txt
index 5b70c43..ccb355b 100644
--- a/krita/plugins/filters/embossfilter/CMakeLists.txt
+++ b/krita/plugins/filters/embossfilter/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritaembossfilter MODULE ${kritaembossfilter_PA=
RT_SRCS})
 =

 target_link_libraries(kritaembossfilter kritaui)
 =

-install(TARGETS kritaembossfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaembossfilter  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/example/CMakeLists.txt b/krita/plugins/f=
ilters/example/CMakeLists.txt
index 5f9a602..7e93d62 100644
--- a/krita/plugins/filters/example/CMakeLists.txt
+++ b/krita/plugins/filters/example/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritaexample MODULE ${kritaexample_PART_SRCS})
 =

 target_link_libraries(kritaexample kritaui)
 =

-install(TARGETS kritaexample  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaexample  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/fastcolortransfer/CMakeLists.txt b/krita=
/plugins/filters/fastcolortransfer/CMakeLists.txt
index 2cb6103..5954111 100644
--- a/krita/plugins/filters/fastcolortransfer/CMakeLists.txt
+++ b/krita/plugins/filters/fastcolortransfer/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(kritafastcolortransferfilter MODULE ${kritafa=
stcolortransferfilter_P
 =

 target_link_libraries(kritafastcolortransferfilter kritaui)
 =

-install(TARGETS kritafastcolortransferfilter  DESTINATION ${PLUGIN_INSTALL=
_DIR})
+install(TARGETS kritafastcolortransferfilter  DESTINATION ${CALLIGRA_PLUGI=
N_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/imageenhancement/CMakeLists.txt b/krita/=
plugins/filters/imageenhancement/CMakeLists.txt
index 2bcb302..1a4b8fc 100644
--- a/krita/plugins/filters/imageenhancement/CMakeLists.txt
+++ b/krita/plugins/filters/imageenhancement/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(kritaimageenhancement MODULE ${kritaimageenha=
ncement_PART_SRCS})
 =

 target_link_libraries(kritaimageenhancement kritaui)
 =

-install(TARGETS kritaimageenhancement  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaimageenhancement  DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/indexcolors/CMakeLists.txt b/krita/plugi=
ns/filters/indexcolors/CMakeLists.txt
index fed0b4c..63adcef 100644
--- a/krita/plugins/filters/indexcolors/CMakeLists.txt
+++ b/krita/plugins/filters/indexcolors/CMakeLists.txt
@@ -5,5 +5,5 @@ ki18n_wrap_ui(INDEXCOLORS_SOURCE kiswdgindexcolors.ui)
 add_library(kritaindexcolors MODULE ${INDEXCOLORS_SOURCE})
 target_link_libraries(kritaindexcolors kritaui)
 =

-install(TARGETS kritaindexcolors          DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS kritaindexcolors          DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 install(FILES   kritaindexcolors.desktop  DESTINATION ${SERVICES_INSTALL_D=
IR}/calligra)
\ No newline at end of file
diff --git a/krita/plugins/filters/levelfilter/CMakeLists.txt b/krita/plugi=
ns/filters/levelfilter/CMakeLists.txt
index 8a00c4f..2dc27bf 100644
--- a/krita/plugins/filters/levelfilter/CMakeLists.txt
+++ b/krita/plugins/filters/levelfilter/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(kritalevelfilter MODULE ${kritalevelfilter_PA=
RT_SRCS})
 =

 target_link_libraries(kritalevelfilter kritaui)
 =

-install(TARGETS kritalevelfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritalevelfilter  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/noisefilter/CMakeLists.txt b/krita/plugi=
ns/filters/noisefilter/CMakeLists.txt
index 67d3158..5c9b270 100644
--- a/krita/plugins/filters/noisefilter/CMakeLists.txt
+++ b/krita/plugins/filters/noisefilter/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(kritanoisefilter MODULE ${kritanoisefilter_PA=
RT_SRCS})
 =

 target_link_libraries(kritanoisefilter kritaui)
 =

-install(TARGETS kritanoisefilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritanoisefilter  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/oilpaintfilter/CMakeLists.txt b/krita/pl=
ugins/filters/oilpaintfilter/CMakeLists.txt
index e6fcbf9..0ab81c7 100644
--- a/krita/plugins/filters/oilpaintfilter/CMakeLists.txt
+++ b/krita/plugins/filters/oilpaintfilter/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritaoilpaintfilter MODULE ${kritaoilpaintfilte=
r_PART_SRCS})
 =

 target_link_libraries(kritaoilpaintfilter kritaui)
 =

-install(TARGETS kritaoilpaintfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaoilpaintfilter  DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/phongbumpmap/CMakeLists.txt b/krita/plug=
ins/filters/phongbumpmap/CMakeLists.txt
index 2eae131..f6a2cea 100644
--- a/krita/plugins/filters/phongbumpmap/CMakeLists.txt
+++ b/krita/plugins/filters/phongbumpmap/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library(kritaphongbumpmap MODULE ${kritaphongbumpmap_=
PART_SRCS})
 =

 target_link_libraries(kritaphongbumpmap kritaui)
 =

-install(TARGETS kritaphongbumpmap  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaphongbumpmap  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/pixelizefilter/CMakeLists.txt b/krita/pl=
ugins/filters/pixelizefilter/CMakeLists.txt
index 026f275..b8b12f4 100644
--- a/krita/plugins/filters/pixelizefilter/CMakeLists.txt
+++ b/krita/plugins/filters/pixelizefilter/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritapixelizefilter MODULE ${kritapixelizefilte=
r_PART_SRCS})
 =

 target_link_libraries(kritapixelizefilter kritaui)
 =

-install(TARGETS kritapixelizefilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapixelizefilter  DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/posterize/CMakeLists.txt b/krita/plugins=
/filters/posterize/CMakeLists.txt
index 508a671..13bb920 100644
--- a/krita/plugins/filters/posterize/CMakeLists.txt
+++ b/krita/plugins/filters/posterize/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritaposterize MODULE ${kritaposterize_PART_SRC=
S})
 =

 target_link_libraries(kritaposterize kritaui)
 =

-install(TARGETS kritaposterize  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaposterize  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/raindropsfilter/CMakeLists.txt b/krita/p=
lugins/filters/raindropsfilter/CMakeLists.txt
index fb649fb..101ae71 100644
--- a/krita/plugins/filters/raindropsfilter/CMakeLists.txt
+++ b/krita/plugins/filters/raindropsfilter/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritaraindropsfilter MODULE ${kritaraindropsfil=
ter_PART_SRCS})
 =

 target_link_libraries(kritaraindropsfilter kritaui)
 =

-install(TARGETS kritaraindropsfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaraindropsfilter  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/randompickfilter/CMakeLists.txt b/krita/=
plugins/filters/randompickfilter/CMakeLists.txt
index 641f134..0938496 100644
--- a/krita/plugins/filters/randompickfilter/CMakeLists.txt
+++ b/krita/plugins/filters/randompickfilter/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(kritarandompickfilter MODULE ${kritarandompic=
kfilter_PART_SRCS})
 =

 target_link_libraries(kritarandompickfilter kritaui)
 =

-install(TARGETS kritarandompickfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritarandompickfilter  DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/roundcorners/CMakeLists.txt b/krita/plug=
ins/filters/roundcorners/CMakeLists.txt
index 280310c..877e25c 100644
--- a/krita/plugins/filters/roundcorners/CMakeLists.txt
+++ b/krita/plugins/filters/roundcorners/CMakeLists.txt
@@ -6,7 +6,7 @@ add_library(kritaroundcornersfilter MODULE ${kritaroundcorn=
ersfilter_PART_SRCS})
 =

 target_link_libraries(kritaroundcornersfilter kritaui)
 =

-install(TARGETS kritaroundcornersfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaroundcornersfilter  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/smalltilesfilter/CMakeLists.txt b/krita/=
plugins/filters/smalltilesfilter/CMakeLists.txt
index 51ca7fb..016fe0f 100644
--- a/krita/plugins/filters/smalltilesfilter/CMakeLists.txt
+++ b/krita/plugins/filters/smalltilesfilter/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritasmalltilesfilter MODULE ${kritasmalltilesf=
ilter_PART_SRCS})
 =

 target_link_libraries(kritasmalltilesfilter kritaui)
 =

-install(TARGETS kritasmalltilesfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritasmalltilesfilter  DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/sobelfilter/CMakeLists.txt b/krita/plugi=
ns/filters/sobelfilter/CMakeLists.txt
index be48442..5af402e 100644
--- a/krita/plugins/filters/sobelfilter/CMakeLists.txt
+++ b/krita/plugins/filters/sobelfilter/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(kritasobelfilter MODULE ${kritasobelfilter_PA=
RT_SRCS})
 =

 target_link_libraries(kritasobelfilter kritaui)
 =

-install(TARGETS kritasobelfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritasobelfilter  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/unsharp/CMakeLists.txt b/krita/plugins/f=
ilters/unsharp/CMakeLists.txt
index 2a88484..7de4a75 100644
--- a/krita/plugins/filters/unsharp/CMakeLists.txt
+++ b/krita/plugins/filters/unsharp/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(kritaunsharpfilter MODULE ${kritaunsharpfilte=
r_PART_SRCS})
 =

 target_link_libraries(kritaunsharpfilter kritaui)
 =

-install(TARGETS kritaunsharpfilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaunsharpfilter  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/filters/wavefilter/CMakeLists.txt b/krita/plugin=
s/filters/wavefilter/CMakeLists.txt
index e9d4f58..325dedf 100644
--- a/krita/plugins/filters/wavefilter/CMakeLists.txt
+++ b/krita/plugins/filters/wavefilter/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(kritawavefilter MODULE ${kritawavefilter_PART=
_SRCS})
 =

 target_link_libraries(kritawavefilter kritaui)
 =

-install(TARGETS kritawavefilter  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritawavefilter  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/formats/bmp/CMakeLists.txt b/krita/plugins/forma=
ts/bmp/CMakeLists.txt
index e725941..7a1b607 100644
--- a/krita/plugins/formats/bmp/CMakeLists.txt
+++ b/krita/plugins/formats/bmp/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritabmpexport MODULE ${kritabmpexport_PART_SRC=
S})
 =

 target_link_libraries(kritabmpexport kritaui)
 =

-install(TARGETS kritabmpexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritabmpexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 install( FILES  krita_bmp_export.desktop  DESTINATION ${SERVICES_INSTALL_D=
IR}/calligra)
 set(kritabmpimport_PART_SRCS
@@ -21,7 +21,7 @@ add_library(kritabmpimport MODULE ${kritabmpimport_PART_S=
RCS})
 =

 target_link_libraries(kritabmpimport kritaui)
 =

-install(TARGETS kritabmpimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritabmpimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 install( FILES  krita_bmp_import.desktop  DESTINATION ${SERVICES_INSTALL_D=
IR}/calligra)
 install( PROGRAMS  krita_bmp.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/krita/plugins/formats/eps/CMakeLists.txt b/krita/plugins/forma=
ts/eps/CMakeLists.txt
index 5cb7912..1a40570 100644
--- a/krita/plugins/formats/eps/CMakeLists.txt
+++ b/krita/plugins/formats/eps/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(kritaepsimport MODULE ${kritaepsimport_PART_S=
RCS})
 =

 target_link_libraries(kritaepsimport kritaui eps ${EXIV2_LIBRARIES} )
 =

-install(TARGETS kritaepsimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaepsimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### next target ###############
 =

@@ -31,7 +31,7 @@ add_library(kritaepsexport MODULE ${kritaepsexport_PART_S=
RCS})
 =

 target_link_libraries(kritaepsexport kritaui eps ${EXIV2_LIBRARIES} )
 =

-install(TARGETS kritaepsexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaepsexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/formats/exr/CMakeLists.txt b/krita/plugins/forma=
ts/exr/CMakeLists.txt
index 2777f68..a1057ce 100644
--- a/krita/plugins/formats/exr/CMakeLists.txt
+++ b/krita/plugins/formats/exr/CMakeLists.txt
@@ -21,7 +21,7 @@ add_library(kritaexrimport MODULE ${kritaexrimport_PART_S=
RCS})
 =

 target_link_libraries(kritaexrimport kritaui ${OPENEXR_LIBRARIES} )
 =

-install(TARGETS kritaexrimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaexrimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### next target ###############
 =

@@ -37,7 +37,7 @@ add_library(kritaexrexport MODULE ${kritaexrexport_PART_S=
RCS})
 =

 target_link_libraries(kritaexrexport kritaui ${OPENEXR_LIBRARIES} )
 =

-install(TARGETS kritaexrexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaexrexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/formats/heightmap/CMakeLists.txt b/krita/plugins=
/formats/heightmap/CMakeLists.txt
index 765b7a2..0606414 100644
--- a/krita/plugins/formats/heightmap/CMakeLists.txt
+++ b/krita/plugins/formats/heightmap/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(kritaheightmapimport MODULE ${kritaheightmapi=
mport_PART_SRCS})
 =

 target_link_libraries(kritaheightmapimport kritaui )
 =

-install(TARGETS kritaheightmapimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaheightmapimport  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 ########### next target ###############
 =

@@ -24,7 +24,7 @@ add_library(kritaheightmapexport MODULE ${kritaheightmape=
xport_PART_SRCS})
 =

 target_link_libraries(kritaheightmapexport kritaui  )
 =

-install(TARGETS kritaheightmapexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaheightmapexport  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 ########### install files ###############
 =

diff --git a/krita/plugins/formats/jp2/CMakeLists.txt b/krita/plugins/forma=
ts/jp2/CMakeLists.txt
index 1c44a92..ff2d84c 100644
--- a/krita/plugins/formats/jp2/CMakeLists.txt
+++ b/krita/plugins/formats/jp2/CMakeLists.txt
@@ -16,7 +16,7 @@ add_library(kritajp2import MODULE ${kritajp2import_PART_S=
RCS})
 =

 target_link_libraries(kritajp2import kritaui ${OPENJPEG_LIBRARIES} )
 =

-install(TARGETS kritajp2import  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritajp2import  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### next target ###############
 =

@@ -32,7 +32,7 @@ add_library(kritajp2export MODULE ${kritajp2export_PART_S=
RCS})
 =

 target_link_libraries(kritajp2export kritaui ${OPENJPEG_LIBRARIES} )
 =

-install(TARGETS kritajp2export  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritajp2export  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/formats/jpeg/CMakeLists.txt b/krita/plugins/form=
ats/jpeg/CMakeLists.txt
index 0ab51a6..0ab0f80 100644
--- a/krita/plugins/formats/jpeg/CMakeLists.txt
+++ b/krita/plugins/formats/jpeg/CMakeLists.txt
@@ -30,7 +30,7 @@ else()
     target_link_libraries(kritajpegimport kritaui jpeg ${LCMS_LIBRARIES} $=
{EXIV2_LIBRARIES} )
 endif()
 =

-install(TARGETS kritajpegimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritajpegimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 ########### next target ###############
 =

@@ -49,7 +49,7 @@ else()
     target_link_libraries(kritajpegexport kritaui jpeg ${LCMS_LIBRARIES} $=
{EXIV2_LIBRARIES} )
 endif()
 =

-install(TARGETS kritajpegexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritajpegexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/formats/odg/CMakeLists.txt b/krita/plugins/forma=
ts/odg/CMakeLists.txt
index 2a5f7f4..f85ea4f 100644
--- a/krita/plugins/formats/odg/CMakeLists.txt
+++ b/krita/plugins/formats/odg/CMakeLists.txt
@@ -13,7 +13,7 @@ add_definitions(${PNG_DEFINITIONS} ${KDE4_ENABLE_EXCEPTIO=
NS})
 =

 target_link_libraries(kritaodgimport kritaui ${PNG_LIBRARIES} )
 =

-install(TARGETS kritaodgimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaodgimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 install( FILES  krita_odg_import.desktop DESTINATION ${SERVICES_INSTALL_DI=
R}/calligra)
 install( PROGRAMS  krita_odg.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/krita/plugins/formats/oiio/CMakeLists.txt b/krita/plugins/form=
ats/oiio/CMakeLists.txt
index 1900638..3f4a1d8 100644
--- a/krita/plugins/formats/oiio/CMakeLists.txt
+++ b/krita/plugins/formats/oiio/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritaoiioexport MODULE ${kritaoiioexport_PART_S=
RCS})
 =

 target_link_libraries(kritaoiioexport kritaui ${OIIO_LIBRARIES})
 =

-install(TARGETS kritaoiioexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaoiioexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 install( FILES  krita_oiio_export.desktop  DESTINATION ${SERVICES_INSTALL_=
DIR}/calligra)
 install( PROGRAMS  krita_oiio.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
@@ -23,7 +23,7 @@ add_library(kritaoiioimport MODULE ${kritaoiioimport_PART=
_SRCS})
 =

 target_link_libraries(kritaoiioimport kritaui ${OIIO_LIBRARIES})
 =

-install(TARGETS kritaoiioimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaoiioimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 install( FILES  krita_oiio_import.desktop  DESTINATION ${SERVICES_INSTALL_=
DIR}/calligra)
 install( PROGRAMS  krita_oiio.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/krita/plugins/formats/ora/CMakeLists.txt b/krita/plugins/forma=
ts/ora/CMakeLists.txt
index 6a99eda..e37d9ac 100644
--- a/krita/plugins/formats/ora/CMakeLists.txt
+++ b/krita/plugins/formats/ora/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(kritaoraimport MODULE ${kritaoraimport_PART_S=
RCS})
 =

 target_link_libraries(kritaoraimport kritaui )
 =

-install(TARGETS kritaoraimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaoraimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### next target ###############
 =

@@ -28,7 +28,7 @@ add_library(kritaoraexport MODULE ${kritaoraexport_PART_S=
RCS})
 =

 target_link_libraries(kritaoraexport kritaui )
 =

-install(TARGETS kritaoraexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaoraexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/formats/pdf/CMakeLists.txt b/krita/plugins/forma=
ts/pdf/CMakeLists.txt
index 8cd5ed1..5835162 100644
--- a/krita/plugins/formats/pdf/CMakeLists.txt
+++ b/krita/plugins/formats/pdf/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(kritapdfimport MODULE ${kritapdfimport_PART_S=
RCS})
 =

 target_link_libraries(kritapdfimport kritaui ${POPPLER_LIBRARY} )
 =

-install(TARGETS kritapdfimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapdfimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 ########### install files ###############
 =

 install( FILES  krita_pdf_import.desktop DESTINATION ${SERVICES_INSTALL_DI=
R}/calligra)
diff --git a/krita/plugins/formats/png/CMakeLists.txt b/krita/plugins/forma=
ts/png/CMakeLists.txt
index 6125e94..e58c00e 100644
--- a/krita/plugins/formats/png/CMakeLists.txt
+++ b/krita/plugins/formats/png/CMakeLists.txt
@@ -16,7 +16,7 @@ add_definitions(${PNG_DEFINITIONS} ${KDE4_ENABLE_EXCEPTIO=
NS})
 =

 target_link_libraries(kritapngimport kritaui ${PNG_LIBRARIES} )
 =

-install(TARGETS kritapngimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapngimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 set(kritapngexport_PART_SRCS
     kis_png_export.cc
@@ -31,7 +31,7 @@ add_library(kritapngexport MODULE ${kritapngexport_PART_S=
RCS})
 =

 target_link_libraries(kritapngexport kritaui ${PNG_LIBRARIES})
 =

-install(TARGETS kritapngexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapngexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 install( FILES  krita_png_import.desktop krita_png_export.desktop  DESTINA=
TION ${SERVICES_INSTALL_DIR}/calligra)
 install( PROGRAMS  krita_png.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/krita/plugins/formats/ppm/CMakeLists.txt b/krita/plugins/forma=
ts/ppm/CMakeLists.txt
index f7bcad6..5bf7d16 100644
--- a/krita/plugins/formats/ppm/CMakeLists.txt
+++ b/krita/plugins/formats/ppm/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(kritappmimport MODULE ${kritappmimport_PART_S=
RCS})
 =

 target_link_libraries(kritappmimport kritaui )
 =

-install(TARGETS kritappmimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritappmimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### next target ###############
 =

@@ -24,7 +24,7 @@ add_library(kritappmexport MODULE ${kritappmexport_PART_S=
RCS})
 =

 target_link_libraries(kritappmexport kritaui  )
 =

-install(TARGETS kritappmexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritappmexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/krita/plugins/formats/psd/CMakeLists.txt b/krita/plugins/forma=
ts/psd/CMakeLists.txt
index 8b7ed01..2b6e29e 100644
--- a/krita/plugins/formats/psd/CMakeLists.txt
+++ b/krita/plugins/formats/psd/CMakeLists.txt
@@ -32,7 +32,7 @@ else ()
 	target_link_libraries(kritapsdimport kritaui )
 endif ()
 =

-install(TARGETS kritapsdimport DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapsdimport DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### next target ###############
 =

@@ -49,7 +49,7 @@ if (WIN32)
 else ()	=

     target_link_libraries(kritapsdexport kritaui )
 endif ()	=

-install(TARGETS kritapsdexport DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapsdexport DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 install( FILES krita_psd_import.desktop =

                krita_psd_export.desktop  =

diff --git a/krita/plugins/formats/qml/CMakeLists.txt b/krita/plugins/forma=
ts/qml/CMakeLists.txt
index 518af3b..b701a81 100644
--- a/krita/plugins/formats/qml/CMakeLists.txt
+++ b/krita/plugins/formats/qml/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(kritaqmlexport MODULE ${kritaqmlexport_PART_S=
RCS})
 =

 target_link_libraries(kritaqmlexport kritaui )
 =

-install(TARGETS kritaqmlexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaqmlexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/formats/raw/CMakeLists.txt b/krita/plugins/forma=
ts/raw/CMakeLists.txt
index 125c6dc..e28badb 100644
--- a/krita/plugins/formats/raw/CMakeLists.txt
+++ b/krita/plugins/formats/raw/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories( ${KDCRAW_INCLUDE_DIR} )
 =

 target_link_libraries(krita_raw_import kritaui  KF5::KDcraw)
 =

-install(TARGETS krita_raw_import  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS krita_raw_import  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/formats/tga/CMakeLists.txt b/krita/plugins/forma=
ts/tga/CMakeLists.txt
index 1b15523..c7c87d9 100644
--- a/krita/plugins/formats/tga/CMakeLists.txt
+++ b/krita/plugins/formats/tga/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(kritatgaexport MODULE ${kritatgaexport_PART_SRC=
S})
 =

 target_link_libraries(kritatgaexport kritaui)
 =

-install(TARGETS kritatgaexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatgaexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 install( FILES  krita_tga_export.desktop  DESTINATION ${SERVICES_INSTALL_D=
IR}/calligra)
 set(kritatgaimport_PART_SRCS
@@ -21,7 +21,7 @@ add_library(kritatgaimport MODULE ${kritatgaimport_PART_S=
RCS})
 =

 target_link_libraries(kritatgaimport kritaui)
 =

-install(TARGETS kritatgaimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatgaimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 install( FILES  krita_tga_import.desktop  DESTINATION ${SERVICES_INSTALL_D=
IR}/calligra)
 install( PROGRAMS  krita_tga.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
diff --git a/krita/plugins/formats/tiff/CMakeLists.txt b/krita/plugins/form=
ats/tiff/CMakeLists.txt
index c2a9fb9..a18771f 100644
--- a/krita/plugins/formats/tiff/CMakeLists.txt
+++ b/krita/plugins/formats/tiff/CMakeLists.txt
@@ -22,7 +22,7 @@ add_library(kritatiffimport MODULE ${kritatiffimport_PART=
_SRCS})
 =

 target_link_libraries(kritatiffimport kritaui ${TIFF_LIBRARIES})
 =

-install(TARGETS kritatiffimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatiffimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### next target ###############
@@ -41,7 +41,7 @@ add_library(kritatiffexport MODULE ${kritatiffexport_PART=
_SRCS})
 =

 target_link_libraries(kritatiffexport kritaui ${TIFF_LIBRARIES})
 =

-install(TARGETS kritatiffexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatiffexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 =

 =

 ########### next target ###############
diff --git a/krita/plugins/formats/xcf/CMakeLists.txt b/krita/plugins/forma=
ts/xcf/CMakeLists.txt
index 8ac0e36..a9d9f43 100644
--- a/krita/plugins/formats/xcf/CMakeLists.txt
+++ b/krita/plugins/formats/xcf/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(kritaxcfimport kritaui )
 if (WIN32)
     target_link_libraries(kritaxcfimport kritaui ${WIN32_PLATFORM_NET_LIBS=
})
 else ()
-    install(TARGETS kritaxcfimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+    install(TARGETS kritaxcfimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 endif ()
 =

 ########### install files ###############
diff --git a/krita/plugins/generators/pattern/CMakeLists.txt b/krita/plugin=
s/generators/pattern/CMakeLists.txt
index ffb29c3..88abf8a 100644
--- a/krita/plugins/generators/pattern/CMakeLists.txt
+++ b/krita/plugins/generators/pattern/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(kritapatterngenerator MODULE ${kritapatternge=
nerator_PART_SRCS})
 =

 target_link_libraries(kritapatterngenerator kritaui)
 =

-install(TARGETS kritapatterngenerator  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapatterngenerator  DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/generators/solid/CMakeLists.txt b/krita/plugins/=
generators/solid/CMakeLists.txt
index b21a337..fed8ab1 100644
--- a/krita/plugins/generators/solid/CMakeLists.txt
+++ b/krita/plugins/generators/solid/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(kritacolorgenerator MODULE ${kritacolorgenera=
tor_PART_SRCS})
 =

 target_link_libraries(kritacolorgenerator kritaui)
 =

-install(TARGETS kritacolorgenerator  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritacolorgenerator  DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/chalk/CMakeLists.txt b/krita/plugins/pa=
intops/chalk/CMakeLists.txt
index a0568c3..b38bf8b 100644
--- a/krita/plugins/paintops/chalk/CMakeLists.txt
+++ b/krita/plugins/paintops/chalk/CMakeLists.txt
@@ -14,7 +14,7 @@ kcoreaddons_desktop_to_json(kritachalkpaintop kritachalkp=
aintop.desktop)
 =

 target_link_libraries(kritachalkpaintop kritalibpaintop)
 =

-install(TARGETS kritachalkpaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritachalkpaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/colorsmudge/CMakeLists.txt b/krita/plug=
ins/paintops/colorsmudge/CMakeLists.txt
index b090ffe..5ddb3be 100644
--- a/krita/plugins/paintops/colorsmudge/CMakeLists.txt
+++ b/krita/plugins/paintops/colorsmudge/CMakeLists.txt
@@ -15,7 +15,7 @@ kcoreaddons_desktop_to_json(kritacolorsmudgepaintop krita=
colorsmudgepaintop.desk
 =

 target_link_libraries(kritacolorsmudgepaintop kritalibpaintop)
 =

-install(TARGETS kritacolorsmudgepaintop DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritacolorsmudgepaintop DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/krita/plugins/paintops/curvebrush/CMakeLists.txt b/krita/plugi=
ns/paintops/curvebrush/CMakeLists.txt
index 6755cba..ac9bd08 100644
--- a/krita/plugins/paintops/curvebrush/CMakeLists.txt
+++ b/krita/plugins/paintops/curvebrush/CMakeLists.txt
@@ -16,7 +16,7 @@ kcoreaddons_desktop_to_json(kritacurvepaintop kritacurvep=
aintop.desktop)
 =

 target_link_libraries(kritacurvepaintop kritalibpaintop)
 =

-install(TARGETS kritacurvepaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritacurvepaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/defaultpaintops/CMakeLists.txt b/krita/=
plugins/paintops/defaultpaintops/CMakeLists.txt
index 959bc64..32eea160 100644
--- a/krita/plugins/paintops/defaultpaintops/CMakeLists.txt
+++ b/krita/plugins/paintops/defaultpaintops/CMakeLists.txt
@@ -25,7 +25,7 @@ add_library(kritadefaultpaintops MODULE ${kritadefaultpai=
ntops_PART_SRCS})
 target_link_libraries(kritadefaultpaintops kritalibpaintop)
 kcoreaddons_desktop_to_json(kritadefaultpaintops kritadefaultpaintops.desk=
top)
 =

-install(TARGETS kritadefaultpaintops  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritadefaultpaintops  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/deform/CMakeLists.txt b/krita/plugins/p=
aintops/deform/CMakeLists.txt
index 01d1f3c..34f65e4 100644
--- a/krita/plugins/paintops/deform/CMakeLists.txt
+++ b/krita/plugins/paintops/deform/CMakeLists.txt
@@ -14,7 +14,7 @@ kcoreaddons_desktop_to_json(kritadeformpaintop kritadefor=
mpaintop.desktop)
 =

 target_link_libraries(kritadeformpaintop kritaui kritalibpaintop)
 =

-install(TARGETS kritadeformpaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritadeformpaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/dynadraw/CMakeLists.txt b/krita/plugins=
/paintops/dynadraw/CMakeLists.txt
index a55e314..87b7e0b 100644
--- a/krita/plugins/paintops/dynadraw/CMakeLists.txt
+++ b/krita/plugins/paintops/dynadraw/CMakeLists.txt
@@ -15,7 +15,7 @@ kcoreaddons_desktop_to_json(kritadynapaintop kritadynapai=
ntop.desktop)
 =

 target_link_libraries(kritadynapaintop kritalibpaintop)
 =

-install(TARGETS kritadynapaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritadynapaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/experiment/CMakeLists.txt b/krita/plugi=
ns/paintops/experiment/CMakeLists.txt
index 47e3f96..67eb3e1 100644
--- a/krita/plugins/paintops/experiment/CMakeLists.txt
+++ b/krita/plugins/paintops/experiment/CMakeLists.txt
@@ -13,7 +13,7 @@ kcoreaddons_desktop_to_json(kritaexperimentpaintop kritae=
xperimentpaintop.deskto
 =

 target_link_libraries(kritaexperimentpaintop kritalibpaintop)
 =

-install(TARGETS kritaexperimentpaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaexperimentpaintop  DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/filterop/CMakeLists.txt b/krita/plugins=
/paintops/filterop/CMakeLists.txt
index c2a734f..c493b2d 100644
--- a/krita/plugins/paintops/filterop/CMakeLists.txt
+++ b/krita/plugins/paintops/filterop/CMakeLists.txt
@@ -11,7 +11,7 @@ kcoreaddons_desktop_to_json(kritafilterop kritafilterop.d=
esktop)
 =

 target_link_libraries(kritafilterop kritalibpaintop)
 =

-install(TARGETS kritafilterop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritafilterop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/gridbrush/CMakeLists.txt b/krita/plugin=
s/paintops/gridbrush/CMakeLists.txt
index 32c4cd5..1271d0f 100644
--- a/krita/plugins/paintops/gridbrush/CMakeLists.txt
+++ b/krita/plugins/paintops/gridbrush/CMakeLists.txt
@@ -15,7 +15,7 @@ kcoreaddons_desktop_to_json(kritagridpaintop kritagridpai=
ntop.desktop)
 =

 target_link_libraries(kritagridpaintop kritalibpaintop)
 =

-install(TARGETS kritagridpaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritagridpaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/hairy/CMakeLists.txt b/krita/plugins/pa=
intops/hairy/CMakeLists.txt
index 54bea12..f5ebf7d 100644
--- a/krita/plugins/paintops/hairy/CMakeLists.txt
+++ b/krita/plugins/paintops/hairy/CMakeLists.txt
@@ -18,7 +18,7 @@ kcoreaddons_desktop_to_json(kritahairypaintop kritahairyp=
aintop.desktop)
 =

 target_link_libraries(kritahairypaintop kritalibpaintop)
 =

-install(TARGETS kritahairypaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritahairypaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/hatching/CMakeLists.txt b/krita/plugins=
/paintops/hatching/CMakeLists.txt
index f24b7bb..9ac17eb 100644
--- a/krita/plugins/paintops/hatching/CMakeLists.txt
+++ b/krita/plugins/paintops/hatching/CMakeLists.txt
@@ -18,7 +18,7 @@ kcoreaddons_desktop_to_json(kritahatchingpaintop kritahat=
chingpaintop.desktop)
 =

 target_link_libraries(kritahatchingpaintop kritalibpaintop)
 =

-install(TARGETS kritahatchingpaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritahatchingpaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/particle/CMakeLists.txt b/krita/plugins=
/paintops/particle/CMakeLists.txt
index daf0f56..9c45b1f 100644
--- a/krita/plugins/paintops/particle/CMakeLists.txt
+++ b/krita/plugins/paintops/particle/CMakeLists.txt
@@ -14,7 +14,7 @@ kcoreaddons_desktop_to_json(kritaparticlepaintop kritapar=
ticlepaintop.desktop)
 =

 target_link_libraries(kritaparticlepaintop kritalibpaintop)
 =

-install(TARGETS kritaparticlepaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaparticlepaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/sketch/CMakeLists.txt b/krita/plugins/p=
aintops/sketch/CMakeLists.txt
index cb77ab7..08855cb 100644
--- a/krita/plugins/paintops/sketch/CMakeLists.txt
+++ b/krita/plugins/paintops/sketch/CMakeLists.txt
@@ -16,7 +16,7 @@ kcoreaddons_desktop_to_json(kritasketchpaintop kritasketc=
hpaintop.desktop)
 =

 target_link_libraries(kritasketchpaintop kritalibpaintop)
 =

-install(TARGETS kritasketchpaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritasketchpaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/paintops/spray/CMakeLists.txt b/krita/plugins/pa=
intops/spray/CMakeLists.txt
index 9e81277..9538405 100644
--- a/krita/plugins/paintops/spray/CMakeLists.txt
+++ b/krita/plugins/paintops/spray/CMakeLists.txt
@@ -17,7 +17,7 @@ kcoreaddons_desktop_to_json(kritaspraypaintop kritasprayp=
aintop.desktop)
 =

 target_link_libraries(kritaspraypaintop kritalibpaintop)
 =

-install(TARGETS kritaspraypaintop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaspraypaintop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/defaulttools/CMakeLists.txt b/krita/plugin=
s/tools/defaulttools/CMakeLists.txt
index 9d86f6c..c398034 100644
--- a/krita/plugins/tools/defaulttools/CMakeLists.txt
+++ b/krita/plugins/tools/defaulttools/CMakeLists.txt
@@ -30,7 +30,7 @@ kcoreaddons_desktop_to_json(kritadefaulttools kritadefaul=
ttools.desktop)
 target_link_libraries(kritadefaulttools kritaui basicflakes)
 target_link_libraries(kritadefaulttools ${Boost_SYSTEM_LIBRARY})
 =

-install(TARGETS kritadefaulttools  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritadefaulttools  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/selectiontools/CMakeLists.txt b/krita/plug=
ins/tools/selectiontools/CMakeLists.txt
index 55053f1..cdad08f 100644
--- a/krita/plugins/tools/selectiontools/CMakeLists.txt
+++ b/krita/plugins/tools/selectiontools/CMakeLists.txt
@@ -16,7 +16,7 @@ kcoreaddons_desktop_to_json(kritaselectiontools kritasele=
ctiontools.desktop)
 =

 target_link_libraries(kritaselectiontools kritaui basicflakes)
 =

-install(TARGETS kritaselectiontools  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritaselectiontools  DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/tool_crop/CMakeLists.txt b/krita/plugins/t=
ools/tool_crop/CMakeLists.txt
index 0ada99a..e8d6b19 100644
--- a/krita/plugins/tools/tool_crop/CMakeLists.txt
+++ b/krita/plugins/tools/tool_crop/CMakeLists.txt
@@ -17,7 +17,7 @@ kcoreaddons_desktop_to_json(kritatoolcrop kritatoolcrop.d=
esktop)
 =

 target_link_libraries(kritatoolcrop kritaui)
 =

-install(TARGETS kritatoolcrop  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatoolcrop  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/tool_dyna/CMakeLists.txt b/krita/plugins/t=
ools/tool_dyna/CMakeLists.txt
index 7ffd498..55d7fe6 100644
--- a/krita/plugins/tools/tool_dyna/CMakeLists.txt
+++ b/krita/plugins/tools/tool_dyna/CMakeLists.txt
@@ -10,7 +10,7 @@ kcoreaddons_desktop_to_json(kritatooldyna kritatooldyna.d=
esktop)
 =

 target_link_libraries(kritatooldyna kritaui)
 =

-install(TARGETS kritatooldyna  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatooldyna  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/tool_grid/CMakeLists.txt b/krita/plugins/t=
ools/tool_grid/CMakeLists.txt
index a4c86df..388bec7 100644
--- a/krita/plugins/tools/tool_grid/CMakeLists.txt
+++ b/krita/plugins/tools/tool_grid/CMakeLists.txt
@@ -11,7 +11,7 @@ kcoreaddons_desktop_to_json(kritatoolgrid kritatoolgrid.d=
esktop)
 =

 target_link_libraries(kritatoolgrid kritaui)
 =

-install(TARGETS kritatoolgrid  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatoolgrid  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/tool_perspectivegrid/CMakeLists.txt b/krit=
a/plugins/tools/tool_perspectivegrid/CMakeLists.txt
index 5ef5cf2..38a60b5 100644
--- a/krita/plugins/tools/tool_perspectivegrid/CMakeLists.txt
+++ b/krita/plugins/tools/tool_perspectivegrid/CMakeLists.txt
@@ -11,7 +11,7 @@ kcoreaddons_desktop_to_json(kritatoolperspectivegrid krit=
atoolperspectivegrid.de
 =

 target_link_libraries(kritatoolperspectivegrid kritaui)
 =

-install(TARGETS kritatoolperspectivegrid  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS kritatoolperspectivegrid  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/tool_polygon/CMakeLists.txt b/krita/plugin=
s/tools/tool_polygon/CMakeLists.txt
index 8122234..761dac3 100644
--- a/krita/plugins/tools/tool_polygon/CMakeLists.txt
+++ b/krita/plugins/tools/tool_polygon/CMakeLists.txt
@@ -12,7 +12,7 @@ kcoreaddons_desktop_to_json(kritatoolpolygon kritatoolpol=
ygon.desktop)
 =

 target_link_libraries(kritatoolpolygon kritaui)
 =

-install(TARGETS kritatoolpolygon  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatoolpolygon  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/tool_polyline/CMakeLists.txt b/krita/plugi=
ns/tools/tool_polyline/CMakeLists.txt
index 6779dfc..3414814 100644
--- a/krita/plugins/tools/tool_polyline/CMakeLists.txt
+++ b/krita/plugins/tools/tool_polyline/CMakeLists.txt
@@ -12,7 +12,7 @@ kcoreaddons_desktop_to_json(kritatoolpolyline kritatoolpo=
lyline.desktop)
 =

 target_link_libraries(kritatoolpolyline kritaui)
 =

-install(TARGETS kritatoolpolyline  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatoolpolyline  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/tool_text/CMakeLists.txt b/krita/plugins/t=
ools/tool_text/CMakeLists.txt
index cbcd9c8..85d23bb 100644
--- a/krita/plugins/tools/tool_text/CMakeLists.txt
+++ b/krita/plugins/tools/tool_text/CMakeLists.txt
@@ -15,7 +15,7 @@ kcoreaddons_desktop_to_json(kritatooltext kritatooltext.d=
esktop)
 =

 target_link_libraries(kritatooltext kritaui)
 =

-install(TARGETS kritatooltext  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatooltext  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/krita/plugins/tools/tool_transform2/CMakeLists.txt b/krita/plu=
gins/tools/tool_transform2/CMakeLists.txt
index 548dd33..99db947 100644
--- a/krita/plugins/tools/tool_transform2/CMakeLists.txt
+++ b/krita/plugins/tools/tool_transform2/CMakeLists.txt
@@ -35,7 +35,7 @@ else ()
   target_link_libraries(kritatooltransform kritaui ${GSL_LIBRARIES} ${GSL_=
CBLAS_LIBRARIES})
 endif ()
 =

-install(TARGETS kritatooltransform  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritatooltransform  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/libs/basicflakes/plugin/CMakeLists.txt b/libs/basicflakes/plug=
in/CMakeLists.txt
index e3aefa6..15eb1d0 100644
--- a/libs/basicflakes/plugin/CMakeLists.txt
+++ b/libs/basicflakes/plugin/CMakeLists.txt
@@ -19,4 +19,4 @@ ki18n_wrap_ui(basicflakesplugin_SRCS
 add_library(calligra_tool_basicflakes MODULE ${basicflakesplugin_SRCS})
 kcoreaddons_desktop_to_json(calligra_tool_basicflakes calligra_tool_basicf=
lakes.desktop)
 target_link_libraries(calligra_tool_basicflakes flake basicflakes)
-install(TARGETS calligra_tool_basicflakes DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS calligra_tool_basicflakes DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
diff --git a/libs/kopageapp/tools/backgroundTool/CMakeLists.txt b/libs/kopa=
geapp/tools/backgroundTool/CMakeLists.txt
index a25a8e1..377e5004 100644
--- a/libs/kopageapp/tools/backgroundTool/CMakeLists.txt
+++ b/libs/kopageapp/tools/backgroundTool/CMakeLists.txt
@@ -15,7 +15,7 @@ target_link_libraries(
     kopageapp
 )
 =

-install(TARGETS kopabackgroundtool  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kopabackgroundtool  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/plan/CMakeLists.txt b/plan/CMakeLists.txt
index 0a401e7..8d248bc 100644
--- a/plan/CMakeLists.txt
+++ b/plan/CMakeLists.txt
@@ -105,7 +105,7 @@ add_library(planpart MODULE ${planpart_PART_SRCS})
 =

 target_link_libraries(planpart KF5::Parts planprivate)
 =

-install(TARGETS planpart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS planpart DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### KPlato executable ###############
diff --git a/plan/plugins/filters/icalendar/export/CMakeLists.txt b/plan/pl=
ugins/filters/icalendar/export/CMakeLists.txt
index eb117d0..ad0fdcb 100644
--- a/plan/plugins/filters/icalendar/export/CMakeLists.txt
+++ b/plan/plugins/filters/icalendar/export/CMakeLists.txt
@@ -15,7 +15,7 @@ add_library(planicalexport MODULE ${icalendarexport_PART_=
SRCS})
 =

 target_link_libraries(planicalexport planprivate kplatokernel komain KF5::=
CalendarCore)
 =

-install(TARGETS planicalexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS planicalexport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/plan/plugins/filters/kplato/import/CMakeLists.txt b/plan/plugi=
ns/filters/kplato/import/CMakeLists.txt
index 884d652..6a17559 100644
--- a/plan/plugins/filters/kplato/import/CMakeLists.txt
+++ b/plan/plugins/filters/kplato/import/CMakeLists.txt
@@ -15,7 +15,7 @@ add_library(plankplatoimport MODULE ${kplatoimport_PART_S=
RCS})
 =

 target_link_libraries(plankplatoimport planprivate kplatokernel komain)
 =

-install(TARGETS plankplatoimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS plankplatoimport  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 =

 ########### install files ###############
diff --git a/plan/plugins/schedulers/rcps/CMakeLists.txt b/plan/plugins/sch=
edulers/rcps/CMakeLists.txt
index 73b0823..65e6045 100644
--- a/plan/plugins/schedulers/rcps/CMakeLists.txt
+++ b/plan/plugins/schedulers/rcps/CMakeLists.txt
@@ -20,7 +20,7 @@ target_link_libraries(
 #    ${LIBRCPS_LIBRARIES}
 )
 =

-install( TARGETS kplatorcpsscheduler DESTINATION ${PLUGIN_INSTALL_DIR} )
+install( TARGETS kplatorcpsscheduler DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR} )
 =

 ########### install files ###############
 =

diff --git a/plan/plugins/schedulers/tj/CMakeLists.txt b/plan/plugins/sched=
ulers/tj/CMakeLists.txt
index 4d6ae8d..0779171 100644
--- a/plan/plugins/schedulers/tj/CMakeLists.txt
+++ b/plan/plugins/schedulers/tj/CMakeLists.txt
@@ -44,7 +44,7 @@ target_link_libraries(
 =

 set_target_properties( plantjscheduler PROPERTIES DEFINE_SYMBOL MAKE_KPLAT=
OTJ_LIB )
 =

-install( TARGETS plantjscheduler DESTINATION ${PLUGIN_INSTALL_DIR} )
+install( TARGETS plantjscheduler DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
} )
 =

 ########### install files ###############
 =

diff --git a/plan/plugins/scripting/CMakeLists.txt b/plan/plugins/scripting=
/CMakeLists.txt
index 74243b7..b5d3ff7 100644
--- a/plan/plugins/scripting/CMakeLists.txt
+++ b/plan/plugins/scripting/CMakeLists.txt
@@ -43,7 +43,7 @@ target_link_libraries(
 =

 set_target_properties(krossmoduleplan PROPERTIES DEFINE_SYMBOL MAKE_KPLATO=
SCRIPTING_LIB)
 =

-install(TARGETS krossmoduleplan DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS krossmoduleplan DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 install(FILES krossmoduleplan.desktop DESTINATION ${SERVICES_INSTALL_DIR}/=
calligra)
 install(FILES planscripting.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ca=
lligra)
 install(FILES scripting.rc DESTINATION ${DATA_INSTALL_DIR}/plan/viewplugin=
s)
diff --git a/plan/workpackage/CMakeLists.txt b/plan/workpackage/CMakeLists.=
txt
index 0392918..f23cf86 100644
--- a/plan/workpackage/CMakeLists.txt
+++ b/plan/workpackage/CMakeLists.txt
@@ -63,7 +63,7 @@ add_library(planworkpart MODULE ${planworkpart_PART_SRCS})
 =

 target_link_libraries(planworkpart Qt5::Core KF5::Parts planworkfactory)
 =

-install(TARGETS planworkpart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS planworkpart DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### KPlatoWork application ###############
diff --git a/plugins/artistictextshape/CMakeLists.txt b/plugins/artistictex=
tshape/CMakeLists.txt
index edf822f..e201e88 100644
--- a/plugins/artistictextshape/CMakeLists.txt
+++ b/plugins/artistictextshape/CMakeLists.txt
@@ -41,4 +41,4 @@ kcoreaddons_desktop_to_json(calligra_shape_artistictext c=
alligra_shape_artistict
 =

 target_link_libraries(calligra_shape_artistictext flake)
 =

-install( TARGETS calligra_shape_artistictext DESTINATION ${PLUGIN_INSTALL_=
DIR} )
+install( TARGETS calligra_shape_artistictext DESTINATION ${CALLIGRA_PLUGIN=
_INSTALL_DIR} )
diff --git a/plugins/chartshape/CMakeLists.txt b/plugins/chartshape/CMakeLi=
sts.txt
index a3633e1..4798ce2 100644
--- a/plugins/chartshape/CMakeLists.txt
+++ b/plugins/chartshape/CMakeLists.txt
@@ -80,4 +80,4 @@ add_library(calligra_shape_chart MODULE ChartShapeFactory=
.cpp )
 kcoreaddons_desktop_to_json(calligra_shape_chart calligra_shape_chart.desk=
top)
 =

 target_link_libraries(calligra_shape_chart chartshapecore KChart flake)
-install(TARGETS calligra_shape_chart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_chart DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
diff --git a/plugins/colorengines/lcms2/CMakeLists.txt b/plugins/colorengin=
es/lcms2/CMakeLists.txt
index d12dfd7..195aaf8 100644
--- a/plugins/colorengines/lcms2/CMakeLists.txt
+++ b/plugins/colorengines/lcms2/CMakeLists.txt
@@ -91,5 +91,5 @@ add_library(kolcmsengine MODULE ${lcmsengine_SRCS})
 kcoreaddons_desktop_to_json(kolcmsengine kolcmsengine.desktop)
 =

 target_link_libraries(kolcmsengine pigmentcms ${LCMS2_LIBRARIES}  ${LINK_O=
PENEXR_LIB})
-install(TARGETS kolcmsengine DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kolcmsengine DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

diff --git a/plugins/commentshape/CMakeLists.txt b/plugins/commentshape/CMa=
keLists.txt
index 9ad1510..6390292 100644
--- a/plugins/commentshape/CMakeLists.txt
+++ b/plugins/commentshape/CMakeLists.txt
@@ -18,4 +18,4 @@ kcoreaddons_desktop_to_json(calligra_shape_comment callig=
ra_shape_comment.deskto
 =

 target_link_libraries(calligra_shape_comment kotextlayout)
 =

-install(TARGETS calligra_shape_comment DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_comment DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
diff --git a/plugins/defaultTools/CMakeLists.txt b/plugins/defaultTools/CMa=
keLists.txt
index af461d5..4b7eb11 100644
--- a/plugins/defaultTools/CMakeLists.txt
+++ b/plugins/defaultTools/CMakeLists.txt
@@ -52,4 +52,4 @@ ki18n_wrap_ui(defaulttools_SRCS
 add_library(calligra_tool_defaults MODULE ${defaulttools_SRCS})
 kcoreaddons_desktop_to_json(calligra_tool_defaults calligra_tool_defaults.=
desktop)
 target_link_libraries(calligra_tool_defaults flake kowidgets)
-install(TARGETS calligra_tool_defaults DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_tool_defaults DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
diff --git a/plugins/dockers/CMakeLists.txt b/plugins/dockers/CMakeLists.txt
index 3f84855..6afc61a 100644
--- a/plugins/dockers/CMakeLists.txt
+++ b/plugins/dockers/CMakeLists.txt
@@ -26,4 +26,4 @@ kcoreaddons_desktop_to_json(calligra_docker_defaults call=
igra_docker_defaults.de
 =

 target_link_libraries(calligra_docker_defaults kowidgets)
 =

-install(TARGETS calligra_docker_defaults DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_docker_defaults DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
diff --git a/plugins/formulashape/CMakeLists.txt b/plugins/formulashape/CMa=
keLists.txt
index 897be8d..548983f 100644
--- a/plugins/formulashape/CMakeLists.txt
+++ b/plugins/formulashape/CMakeLists.txt
@@ -113,7 +113,7 @@ target_link_libraries(calligra_shape_formular kformula =
${M2MML_TOOL_LIBRARIES})
 =

 =

 #set_target_properties(kformula PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_=
VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
-install(TARGETS calligra_shape_formular  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_formular  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 =

 add_subdirectory( pics ) =

 add_subdirectory( fonts ) =

diff --git a/plugins/kexi/spreadsheet/CMakeLists.txt b/plugins/kexi/spreads=
heet/CMakeLists.txt
index d2c235e..6d924cd 100644
--- a/plugins/kexi/spreadsheet/CMakeLists.txt
+++ b/plugins/kexi/spreadsheet/CMakeLists.txt
@@ -24,4 +24,4 @@ target_link_libraries(keximigrate_spreadsheet
     Predicate
 )
 =

-install(TARGETS keximigrate_spreadsheet DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS keximigrate_spreadsheet DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
diff --git a/plugins/musicshape/CMakeLists.txt b/plugins/musicshape/CMakeLi=
sts.txt
index 6f8e1b2..82d1af8 100644
--- a/plugins/musicshape/CMakeLists.txt
+++ b/plugins/musicshape/CMakeLists.txt
@@ -95,4 +95,4 @@ add_library(calligra_shape_music MODULE ${musicshape_LIB_=
SRCS})
 kcoreaddons_desktop_to_json(calligra_shape_music calligra_shape_music.desk=
top)
 =

 target_link_libraries(calligra_shape_music flake Qt5::Svg)
-install(TARGETS calligra_shape_music DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_music DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
diff --git a/plugins/pathshapes/CMakeLists.txt b/plugins/pathshapes/CMakeLi=
sts.txt
index 712fd80..e66e59f 100644
--- a/plugins/pathshapes/CMakeLists.txt
+++ b/plugins/pathshapes/CMakeLists.txt
@@ -42,4 +42,4 @@ kcoreaddons_desktop_to_json(calligra_shape_paths calligra=
_shape_paths.desktop)
 =

 target_link_libraries(calligra_shape_paths flake kowidgets)
 =

-install(TARGETS calligra_shape_paths  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_paths  DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
diff --git a/plugins/pictureshape/CMakeLists.txt b/plugins/pictureshape/CMa=
keLists.txt
index 0d6ff47..a722165 100644
--- a/plugins/pictureshape/CMakeLists.txt
+++ b/plugins/pictureshape/CMakeLists.txt
@@ -24,4 +24,4 @@ add_library(calligra_shape_picture MODULE ${pictureshape_=
LIB_SRCS})
 kcoreaddons_desktop_to_json(calligra_shape_picture calligra_shape_picture.=
desktop)
 =

 target_link_libraries(calligra_shape_picture flake ${KDE4_KFILE_LIBRARY})
-install(TARGETS calligra_shape_picture DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_picture DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
diff --git a/plugins/pluginshape/CMakeLists.txt b/plugins/pluginshape/CMake=
Lists.txt
index a1c84ca..61b00c4 100644
--- a/plugins/pluginshape/CMakeLists.txt
+++ b/plugins/pluginshape/CMakeLists.txt
@@ -13,4 +13,4 @@ kcoreaddons_desktop_to_json(calligra_shape_plugin calligr=
a_shape_plugin.desktop)
 =

 target_link_libraries(calligra_shape_plugin komain
   )
-install(TARGETS calligra_shape_plugin DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_plugin DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
diff --git a/plugins/semanticitems/authorsection/CMakeLists.txt b/plugins/s=
emanticitems/authorsection/CMakeLists.txt
index 0d60f7d..9b3a75f 100644
--- a/plugins/semanticitems/authorsection/CMakeLists.txt
+++ b/plugins/semanticitems/authorsection/CMakeLists.txt
@@ -16,4 +16,4 @@ kcoreaddons_desktop_to_json(calligra_semanticitem_authors=
ection calligra_semanti
 =

 target_link_libraries(calligra_semanticitem_authorsection   ${KORDF_LIBS})
 =

-install(TARGETS calligra_semanticitem_authorsection  DESTINATION ${PLUGIN_=
INSTALL_DIR})
+install(TARGETS calligra_semanticitem_authorsection  DESTINATION ${CALLIGR=
A_PLUGIN_INSTALL_DIR})
diff --git a/plugins/semanticitems/contact/CMakeLists.txt b/plugins/semanti=
citems/contact/CMakeLists.txt
index a57a016..e1c7b9f 100644
--- a/plugins/semanticitems/contact/CMakeLists.txt
+++ b/plugins/semanticitems/contact/CMakeLists.txt
@@ -25,4 +25,4 @@ endif ()
 target_link_libraries(calligra_semanticitem_contact   ${KORDF_LIBS})
 kcoreaddons_desktop_to_json(calligra_semanticitem_contact calligra_semanti=
citem_contact.desktop)
 =

-install(TARGETS calligra_semanticitem_contact  DESTINATION ${PLUGIN_INSTAL=
L_DIR})
+install(TARGETS calligra_semanticitem_contact  DESTINATION ${CALLIGRA_PLUG=
IN_INSTALL_DIR})
diff --git a/plugins/semanticitems/event/CMakeLists.txt b/plugins/semantici=
tems/event/CMakeLists.txt
index fa7cb3c..3525f7a 100644
--- a/plugins/semanticitems/event/CMakeLists.txt
+++ b/plugins/semanticitems/event/CMakeLists.txt
@@ -25,4 +25,4 @@ endif ()
 target_link_libraries(calligra_semanticitem_event   ${KORDF_LIBS})
 kcoreaddons_desktop_to_json(calligra_semanticitem_event calligra_semantici=
tem_event.desktop)
 =

-install(TARGETS calligra_semanticitem_event  DESTINATION ${PLUGIN_INSTALL_=
DIR})
+install(TARGETS calligra_semanticitem_event  DESTINATION ${CALLIGRA_PLUGIN=
_INSTALL_DIR})
diff --git a/plugins/semanticitems/location/CMakeLists.txt b/plugins/semant=
icitems/location/CMakeLists.txt
index 9262796..b9fc3f0 100644
--- a/plugins/semanticitems/location/CMakeLists.txt
+++ b/plugins/semanticitems/location/CMakeLists.txt
@@ -32,4 +32,4 @@ endif()
 target_link_libraries(calligra_semanticitem_location   ${KORDF_LIBS})
 kcoreaddons_desktop_to_json(calligra_semanticitem_location calligra_semant=
icitem_location.desktop)
 =

-install(TARGETS calligra_semanticitem_location  DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS calligra_semanticitem_location  DESTINATION ${CALLIGRA_PLU=
GIN_INSTALL_DIR})
diff --git a/plugins/spacenavigator/CMakeLists.txt b/plugins/spacenavigator=
/CMakeLists.txt
index 09fa9dd..4f1a427 100644
--- a/plugins/spacenavigator/CMakeLists.txt
+++ b/plugins/spacenavigator/CMakeLists.txt
@@ -15,4 +15,4 @@ set ( spacenavigator_SRCS
 add_library(calligra_device_spacenavigator MODULE ${spacenavigator_SRCS})
 kcoreaddons_desktop_to_json(calligra_device_spacenavigator calligra_device=
_spacenavigator.desktop)
 target_link_libraries(calligra_device_spacenavigator ${SPNAV_LIBRARY} ${X1=
1_LIBRARIES} kotext)
-install(TARGETS calligra_device_spacenavigator DESTINATION ${PLUGIN_INSTAL=
L_DIR})
+install(TARGETS calligra_device_spacenavigator DESTINATION ${CALLIGRA_PLUG=
IN_INSTALL_DIR})
diff --git a/plugins/staging/googledocs/CMakeLists.txt b/plugins/staging/go=
ogledocs/CMakeLists.txt
index 58a7c77..b0040b7 100644
--- a/plugins/staging/googledocs/CMakeLists.txt
+++ b/plugins/staging/googledocs/CMakeLists.txt
@@ -27,7 +27,7 @@ add_library(calligragoogledocs MODULE ${calligragoogledoc=
s_PART_SRCS})
 =

 target_link_libraries(calligragoogledocs ${QT_LIBRARIES} komain )
 =

-install(TARGETS calligragoogledocs  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligragoogledocs  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 =

 ########### install files ###############
diff --git a/plugins/staging/pivottables/CMakeLists.txt b/plugins/staging/p=
ivottables/CMakeLists.txt
index e5a09d7..17d2a64 100644
--- a/plugins/staging/pivottables/CMakeLists.txt
+++ b/plugins/staging/pivottables/CMakeLists.txt
@@ -20,7 +20,7 @@ kcoreaddons_desktop_to_json(sheetspivottables sheetspivot=
tables.desktop)
 =

 target_link_libraries(sheetspivottables calligrasheetscommon)
 =

-install(TARGETS sheetspivottables DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS sheetspivottables DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 install( FILES  pivottables.rc  DESTINATION ${DATA_INSTALL_DIR}/sheets/vie=
wplugins)
 =

 =

diff --git a/plugins/staging/templateshape/CMakeLists.txt b/plugins/staging=
/templateshape/CMakeLists.txt
index 7359cda..1d74a8e 100644
--- a/plugins/staging/templateshape/CMakeLists.txt
+++ b/plugins/staging/templateshape/CMakeLists.txt
@@ -36,7 +36,7 @@ target_link_libraries(calligra_shape_template flake    ${=
KDE4_KFILE_LIBRARY})
 #Template: Possibly you need to link with komain too.
 #target_link_libraries(templateshape komain flake    ${KDE4_KFILE_LIBRARY})
 =

-install(TARGETS calligra_shape_template DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_template DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/plugins/staging/threedshape/CMakeLists.txt b/plugins/staging/t=
hreedshape/CMakeLists.txt
index 6558045..ebc65a5 100644
--- a/plugins/staging/threedshape/CMakeLists.txt
+++ b/plugins/staging/threedshape/CMakeLists.txt
@@ -19,4 +19,4 @@ add_library(calligra_shape_threed MODULE ${threedshape_LI=
B_SRCS})
 kcoreaddons_desktop_to_json(calligra_shape_threed calligra_shape_threed.de=
sktop)
 =

 target_link_libraries(calligra_shape_threed flake    ${KDE4_KFILE_LIBRARY})
-install(TARGETS calligra_shape_threed DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_threed DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
diff --git a/plugins/textediting/autocorrection/CMakeLists.txt b/plugins/te=
xtediting/autocorrection/CMakeLists.txt
index 54ae72f..ed943ea 100644
--- a/plugins/textediting/autocorrection/CMakeLists.txt
+++ b/plugins/textediting/autocorrection/CMakeLists.txt
@@ -20,4 +20,4 @@ kcoreaddons_desktop_to_json(calligra_textediting_autocorr=
ect calligra_texteditin
 =

 target_link_libraries(calligra_textediting_autocorrect kowidgets)
 =

-install(TARGETS calligra_textediting_autocorrect DESTINATION ${PLUGIN_INST=
ALL_DIR})
+install(TARGETS calligra_textediting_autocorrect DESTINATION ${CALLIGRA_PL=
UGIN_INSTALL_DIR})
diff --git a/plugins/textediting/changecase/CMakeLists.txt b/plugins/texted=
iting/changecase/CMakeLists.txt
index 4f27db7..810ee8c 100644
--- a/plugins/textediting/changecase/CMakeLists.txt
+++ b/plugins/textediting/changecase/CMakeLists.txt
@@ -13,4 +13,4 @@ kcoreaddons_desktop_to_json(calligra_textediting_changeca=
se calligra_textediting
 =

 target_link_libraries(calligra_textediting_changecase kotext)
 =

-install(TARGETS calligra_textediting_changecase DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS calligra_textediting_changecase DESTINATION ${CALLIGRA_PLU=
GIN_INSTALL_DIR})
diff --git a/plugins/textediting/spellcheck/CMakeLists.txt b/plugins/texted=
iting/spellcheck/CMakeLists.txt
index 32c5ade..b55c2d1 100644
--- a/plugins/textediting/spellcheck/CMakeLists.txt
+++ b/plugins/textediting/spellcheck/CMakeLists.txt
@@ -16,4 +16,4 @@ kcoreaddons_desktop_to_json(calligra_textediting_spellche=
ck calligra_textediting
 =

 target_link_libraries(calligra_textediting_spellcheck kotext kotextlayout =
KF5::SonnetCore KF5::SonnetUi)
 =

-install(TARGETS calligra_textediting_spellcheck DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS calligra_textediting_spellcheck DESTINATION ${CALLIGRA_PLU=
GIN_INSTALL_DIR})
diff --git a/plugins/textediting/thesaurus/CMakeLists.txt b/plugins/textedi=
ting/thesaurus/CMakeLists.txt
index c9191e1..067eed4 100644
--- a/plugins/textediting/thesaurus/CMakeLists.txt
+++ b/plugins/textediting/thesaurus/CMakeLists.txt
@@ -17,7 +17,7 @@ kcoreaddons_desktop_to_json(calligra_textediting_thesauru=
s calligra_textediting_
 =

 target_link_libraries(calligra_textediting_thesaurus kotext)
 =

-install(TARGETS calligra_textediting_thesaurus  DESTINATION ${PLUGIN_INSTA=
LL_DIR})
+install(TARGETS calligra_textediting_thesaurus  DESTINATION ${CALLIGRA_PLU=
GIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/plugins/textshape/CMakeLists.txt b/plugins/textshape/CMakeList=
s.txt
index 8d1f608..a729f11 100644
--- a/plugins/textshape/CMakeLists.txt
+++ b/plugins/textshape/CMakeLists.txt
@@ -180,7 +180,7 @@ if( SHOULD_BUILD_FEATURE_RDF )
 endif()
 =

 =

-install(TARGETS calligra_shape_text DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_text DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 ########### install files ###############
 =

diff --git a/plugins/variables/CMakeLists.txt b/plugins/variables/CMakeList=
s.txt
index ee16186..ba7d24c 100644
--- a/plugins/variables/CMakeLists.txt
+++ b/plugins/variables/CMakeLists.txt
@@ -33,4 +33,4 @@ kcoreaddons_desktop_to_json(calligra_textinlineobject_var=
iables calligra_textinl
 =

 target_link_libraries(calligra_textinlineobject_variables kotext kotextlay=
out)
 =

-install(TARGETS calligra_textinlineobject_variables DESTINATION ${PLUGIN_I=
NSTALL_DIR})
+install(TARGETS calligra_textinlineobject_variables DESTINATION ${CALLIGRA=
_PLUGIN_INSTALL_DIR})
diff --git a/plugins/vectorshape/CMakeLists.txt b/plugins/vectorshape/CMake=
Lists.txt
index 4070d13..57ee431 100644
--- a/plugins/vectorshape/CMakeLists.txt
+++ b/plugins/vectorshape/CMakeLists.txt
@@ -22,7 +22,7 @@ kcoreaddons_desktop_to_json(calligra_shape_vector calligr=
a_shape_vector.desktop)
 =

 target_link_libraries(calligra_shape_vector flake kovectorimage Qt5::Svg)
 =

-install(TARGETS calligra_shape_vector DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_vector DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 =

 ########### install files ###############
 =

diff --git a/plugins/videoshape/CMakeLists.txt b/plugins/videoshape/CMakeLi=
sts.txt
index 5c75c70..19626e4 100644
--- a/plugins/videoshape/CMakeLists.txt
+++ b/plugins/videoshape/CMakeLists.txt
@@ -40,4 +40,4 @@ target_link_libraries(calligra_shape_video flake
     ${PHONON_LIBS}
 )
 =

-install(TARGETS calligra_shape_video DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_video DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt
index ec162ae..778af1e 100644
--- a/sheets/CMakeLists.txt
+++ b/sheets/CMakeLists.txt
@@ -326,7 +326,7 @@ add_library(calligrasheetspart MODULE ${calligrasheetsp=
art_PART_SRCS})
 =

 target_link_libraries(calligrasheetspart calligrasheetscommon )
 =

-install(TARGETS calligrasheetspart  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligrasheetspart  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 =

 ########### install files ###############
 =

diff --git a/sheets/functions/CMakeLists.txt b/sheets/functions/CMakeLists.=
txt
index 594b630..c5dfa6a 100644
--- a/sheets/functions/CMakeLists.txt
+++ b/sheets/functions/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(${CMAKE_SOURCE_DIR}/sheets ${KOMAIN_INC=
LUDES} ${FLAKE_INCLUD
 =

 add_library(kspreadbitopsmodule MODULE bitops.cpp)
 target_link_libraries(kspreadbitopsmodule calligrasheetscommon)
-install(TARGETS kspreadbitopsmodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadbitopsmodule DESTINATION ${CALLIGRA_PLUGIN_INSTALL_=
DIR})
 install(FILES kspreadbitopsmodule.desktop DESTINATION ${SERVICES_INSTALL_D=
IR}/calligra)
 install(FILES bitops.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
 =

@@ -13,7 +13,7 @@ install(FILES bitops.xml DESTINATION ${DATA_INSTALL_DIR}/=
sheets/functions)
 =

 add_library(kspreadconversionmodule MODULE conversion.cpp)
 target_link_libraries(kspreadconversionmodule calligrasheetscommon)
-install(TARGETS kspreadconversionmodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadconversionmodule DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
 install(FILES kspreadconversionmodule.desktop DESTINATION ${SERVICES_INSTA=
LL_DIR}/calligra)
 install(FILES conversion.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functi=
ons)
 =

@@ -21,7 +21,7 @@ install(FILES conversion.xml DESTINATION ${DATA_INSTALL_D=
IR}/sheets/functions)
 =

 add_library(kspreaddatabasemodule MODULE database.cpp)
 target_link_libraries(kspreaddatabasemodule calligrasheetscommon)
-install(TARGETS kspreaddatabasemodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreaddatabasemodule DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 install(FILES kspreaddatabasemodule.desktop DESTINATION ${SERVICES_INSTALL=
_DIR}/calligra)
 install(FILES database.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/function=
s)
 =

@@ -29,7 +29,7 @@ install(FILES database.xml DESTINATION ${DATA_INSTALL_DIR=
}/sheets/functions)
 =

 add_library(kspreaddatetimemodule MODULE datetime.cpp)
 target_link_libraries(kspreaddatetimemodule calligrasheetscommon)
-install(TARGETS kspreaddatetimemodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreaddatetimemodule DESTINATION ${CALLIGRA_PLUGIN_INSTAL=
L_DIR})
 install(FILES kspreaddatetimemodule.desktop DESTINATION ${SERVICES_INSTALL=
_DIR}/calligra)
 install(FILES datetime.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/function=
s)
 =

@@ -37,7 +37,7 @@ install(FILES datetime.xml DESTINATION ${DATA_INSTALL_DIR=
}/sheets/functions)
 =

 add_library(kspreadengineeringmodule MODULE engineering.cpp)
 target_link_libraries(kspreadengineeringmodule calligrasheetscommon)
-install(TARGETS kspreadengineeringmodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadengineeringmodule DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 install(FILES kspreadengineeringmodule.desktop DESTINATION ${SERVICES_INST=
ALL_DIR}/calligra)
 install(FILES engineering.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/funct=
ions)
 =

@@ -45,7 +45,7 @@ install(FILES engineering.xml DESTINATION ${DATA_INSTALL_=
DIR}/sheets/functions)
 =

 add_library(kspreadfinancialmodule MODULE financial.cpp)
 target_link_libraries(kspreadfinancialmodule calligrasheetscommon)
-install(TARGETS kspreadfinancialmodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadfinancialmodule DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
 install(FILES kspreadfinancialmodule.desktop DESTINATION ${SERVICES_INSTAL=
L_DIR}/calligra)
 install(FILES financial.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functio=
ns)
 =

@@ -53,7 +53,7 @@ install(FILES financial.xml DESTINATION ${DATA_INSTALL_DI=
R}/sheets/functions)
 =

 add_library(kspreadinformationmodule MODULE information.cpp)
 target_link_libraries(kspreadinformationmodule calligrasheetscommon)
-install(TARGETS kspreadinformationmodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadinformationmodule DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 install(FILES kspreadinformationmodule.desktop DESTINATION ${SERVICES_INST=
ALL_DIR}/calligra)
 install(FILES information.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/funct=
ions)
 =

@@ -61,7 +61,7 @@ install(FILES information.xml DESTINATION ${DATA_INSTALL_=
DIR}/sheets/functions)
 =

 add_library(kspreadlogicmodule MODULE logic.cpp)
 target_link_libraries(kspreadlogicmodule calligrasheetscommon)
-install(TARGETS kspreadlogicmodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadlogicmodule DESTINATION ${CALLIGRA_PLUGIN_INSTALL_D=
IR})
 install(FILES kspreadlogicmodule.desktop DESTINATION ${SERVICES_INSTALL_DI=
R}/calligra)
 install(FILES logic.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
 =

@@ -69,7 +69,7 @@ install(FILES logic.xml DESTINATION ${DATA_INSTALL_DIR}/s=
heets/functions)
 =

 add_library(kspreadmathmodule MODULE math.cpp)
 target_link_libraries(kspreadmathmodule calligrasheetscommon)
-install(TARGETS kspreadmathmodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadmathmodule DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 install(FILES kspreadmathmodule.desktop DESTINATION ${SERVICES_INSTALL_DIR=
}/calligra)
 install(FILES math.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
 =

@@ -77,7 +77,7 @@ install(FILES math.xml DESTINATION ${DATA_INSTALL_DIR}/sh=
eets/functions)
 =

 add_library(kspreadreferencemodule MODULE reference.cpp)
 target_link_libraries(kspreadreferencemodule calligrasheetscommon)
-install(TARGETS kspreadreferencemodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadreferencemodule DESTINATION ${CALLIGRA_PLUGIN_INSTA=
LL_DIR})
 install(FILES kspreadreferencemodule.desktop DESTINATION ${SERVICES_INSTAL=
L_DIR}/calligra)
 install(FILES reference.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functio=
ns)
 =

@@ -85,7 +85,7 @@ install(FILES reference.xml DESTINATION ${DATA_INSTALL_DI=
R}/sheets/functions)
 =

 add_library(kspreadstatisticalmodule MODULE statistical.cpp)
 target_link_libraries(kspreadstatisticalmodule calligrasheetscommon)
-install(TARGETS kspreadstatisticalmodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadstatisticalmodule DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
 install(FILES kspreadstatisticalmodule.desktop DESTINATION ${SERVICES_INST=
ALL_DIR}/calligra)
 install(FILES statistical.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/funct=
ions)
 =

@@ -93,7 +93,7 @@ install(FILES statistical.xml DESTINATION ${DATA_INSTALL_=
DIR}/sheets/functions)
 =

 add_library(kspreadtextmodule MODULE text.cpp)
 target_link_libraries(kspreadtextmodule calligrasheetscommon)
-install(TARGETS kspreadtextmodule DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kspreadtextmodule DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 install(FILES kspreadtextmodule.desktop DESTINATION ${SERVICES_INSTALL_DIR=
}/calligra)
 install(FILES text.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
 =

@@ -101,6 +101,6 @@ install(FILES text.xml DESTINATION ${DATA_INSTALL_DIR}/=
sheets/functions)
 =

 add_library(kspreadtrigonometrymodule MODULE trig.cpp)
 target_link_libraries(kspreadtrigonometrymodule calligrasheetscommon)
-install(TARGETS kspreadtrigonometrymodule DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS kspreadtrigonometrymodule DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
 install(FILES kspreadtrigonometrymodule.desktop DESTINATION ${SERVICES_INS=
TALL_DIR}/calligra)
 install(FILES trig.xml DESTINATION ${DATA_INSTALL_DIR}/sheets/functions)
diff --git a/sheets/plugins/calendar/CMakeLists.txt b/sheets/plugins/calend=
ar/CMakeLists.txt
index 7e3338b..5159bf6 100644
--- a/sheets/plugins/calendar/CMakeLists.txt
+++ b/sheets/plugins/calendar/CMakeLists.txt
@@ -4,5 +4,5 @@ set(kspread_plugin_tool_calendar_SRCS CalendarTool.cpp Cale=
ndarToolFactory.cpp C
 ki18n_wrap_ui(kspread_plugin_tool_calendar_SRCS CalendarToolWidget.ui)
 add_library(kspread_plugin_tool_calendar MODULE ${kspread_plugin_tool_cale=
ndar_SRCS})
 target_link_libraries(kspread_plugin_tool_calendar calligrasheetscommon)
-install(TARGETS kspread_plugin_tool_calendar DESTINATION ${PLUGIN_INSTALL_=
DIR})
+install(TARGETS kspread_plugin_tool_calendar DESTINATION ${CALLIGRA_PLUGIN=
_INSTALL_DIR})
 install(FILES kspread_plugin_tool_calendar.desktop DESTINATION ${SERVICES_=
INSTALL_DIR}/calligra)
diff --git a/sheets/plugins/scripting/CMakeLists.txt b/sheets/plugins/scrip=
ting/CMakeLists.txt
index 1f7d5c0..489b033 100644
--- a/sheets/plugins/scripting/CMakeLists.txt
+++ b/sheets/plugins/scripting/CMakeLists.txt
@@ -18,7 +18,7 @@ qt5_wrap_cpp(krossmodulesheets_PART_SRCS ScriptingReader.=
h ScriptingWriter.h)
 add_library(krossmodulesheets MODULE ${krossmodulesheets_PART_SRCS})
 =

 target_link_libraries(krossmodulesheets   calligrasheetscommon kokross)
-install(TARGETS krossmodulesheets DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS krossmodulesheets DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 ########### install files ###############
 =

diff --git a/sheets/plugins/solver/CMakeLists.txt b/sheets/plugins/solver/C=
MakeLists.txt
index 9cdd990..e31b2ad 100644
--- a/sheets/plugins/solver/CMakeLists.txt
+++ b/sheets/plugins/solver/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries( sheetssolver
         calligrasheetscommon
 )
 =

-install(TARGETS sheetssolver  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS sheetssolver  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/sheets/shape/CMakeLists.txt b/sheets/shape/CMakeLists.txt
index 524ee55..b72f130 100644
--- a/sheets/shape/CMakeLists.txt
+++ b/sheets/shape/CMakeLists.txt
@@ -23,8 +23,8 @@ add_library(calligra_shape_spreadsheet MODULE TableShapeF=
actory.cpp)
 target_link_libraries(calligra_shape_spreadsheet-deferred calligrasheetsco=
mmon)
 target_link_libraries(calligra_shape_spreadsheet flake)
 =

-install(TARGETS calligra_shape_spreadsheet-deferred DESTINATION ${PLUGIN_I=
NSTALL_DIR})
-install(TARGETS calligra_shape_spreadsheet DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS calligra_shape_spreadsheet-deferred DESTINATION ${CALLIGRA=
_PLUGIN_INSTALL_DIR})
+install(TARGETS calligra_shape_spreadsheet DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
 =

 ########### install files ###############
 =

diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
index ee3e611..3447534 100644
--- a/stage/part/CMakeLists.txt
+++ b/stage/part/CMakeLists.txt
@@ -169,7 +169,7 @@ kcoreaddons_desktop_to_json(calligrastagepart stagepart=
.desktop)
 =

 target_link_libraries(calligrastagepart calligrastageprivate )
 =

-install(TARGETS calligrastagepart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS calligrastagepart DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DI=
R})
 =

 ### GUI files ###
 install( FILES stage.rc stage_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/=
stage)
diff --git a/stage/part/tools/animationtool/CMakeLists.txt b/stage/part/too=
ls/animationtool/CMakeLists.txt
index 18ceb76..5a36bac 100644
--- a/stage/part/tools/animationtool/CMakeLists.txt
+++ b/stage/part/tools/animationtool/CMakeLists.txt
@@ -30,7 +30,7 @@ target_link_libraries(
     calligrastageprivate
     )
 =

-install(TARGETS calligrastagetoolanimation  DESTINATION ${PLUGIN_INSTALL_D=
IR})
+install(TARGETS calligrastagetoolanimation  DESTINATION ${CALLIGRA_PLUGIN_=
INSTALL_DIR})
 =

 =

 ########### install files ###############
diff --git a/stage/plugins/eventactions/CMakeLists.txt b/stage/plugins/even=
tactions/CMakeLists.txt
index 19a202b..3e2ed77 100644
--- a/stage/plugins/eventactions/CMakeLists.txt
+++ b/stage/plugins/eventactions/CMakeLists.txt
@@ -25,4 +25,4 @@ target_link_libraries(
     Qt5::Gui
     )
 =

-install(TARGETS calligrastageeventactions  DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS calligrastageeventactions  DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
diff --git a/stage/plugins/pageeffects/barwipe/CMakeLists.txt b/stage/plugi=
ns/pageeffects/barwipe/CMakeLists.txt
index 29751b4..c612a5a 100644
--- a/stage/plugins/pageeffects/barwipe/CMakeLists.txt
+++ b/stage/plugins/pageeffects/barwipe/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(
     Qt5::Gui
     )
 =

-install(TARGETS kpr_pageeffect_barwipe  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kpr_pageeffect_barwipe  DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
diff --git a/stage/plugins/pageeffects/clockwipe/CMakeLists.txt b/stage/plu=
gins/pageeffects/clockwipe/CMakeLists.txt
index 805aef9..2c941a5 100644
--- a/stage/plugins/pageeffects/clockwipe/CMakeLists.txt
+++ b/stage/plugins/pageeffects/clockwipe/CMakeLists.txt
@@ -36,4 +36,4 @@ target_link_libraries(
     Qt5::Gui
     )
 =

-install(TARGETS kpr_pageeffect_clockwipe  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS kpr_pageeffect_clockwipe  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
diff --git a/stage/plugins/pageeffects/edgewipe/CMakeLists.txt b/stage/plug=
ins/pageeffects/edgewipe/CMakeLists.txt
index 604bc05..48ecf1b 100644
--- a/stage/plugins/pageeffects/edgewipe/CMakeLists.txt
+++ b/stage/plugins/pageeffects/edgewipe/CMakeLists.txt
@@ -47,4 +47,4 @@ target_link_libraries(
     Qt5::Gui    =

     )
 =

-install(TARGETS kpr_pageeffect_edgewipe  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kpr_pageeffect_edgewipe  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
diff --git a/stage/plugins/pageeffects/example/CMakeLists.txt b/stage/plugi=
ns/pageeffects/example/CMakeLists.txt
index cdc9889..1484022 100644
--- a/stage/plugins/pageeffects/example/CMakeLists.txt
+++ b/stage/plugins/pageeffects/example/CMakeLists.txt
@@ -8,4 +8,4 @@ kcoreaddons_desktop_to_json(kpr_pageeffect_example kpr_page=
effect_example.deskto
 =

 target_link_libraries(kpr_pageeffect_example calligrastageprivate flake )
 =

-install(TARGETS kpr_pageeffect_example  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kpr_pageeffect_example  DESTINATION ${CALLIGRA_PLUGIN_INST=
ALL_DIR})
diff --git a/stage/plugins/pageeffects/fade/CMakeLists.txt b/stage/plugins/=
pageeffects/fade/CMakeLists.txt
index ac06dfe..d5b93a0 100644
--- a/stage/plugins/pageeffects/fade/CMakeLists.txt
+++ b/stage/plugins/pageeffects/fade/CMakeLists.txt
@@ -20,4 +20,4 @@ target_link_libraries(
     Qt5::Gui
     )
 =

-install(TARGETS kpr_pageeffect_fade  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kpr_pageeffect_fade  DESTINATION ${CALLIGRA_PLUGIN_INSTALL=
_DIR})
diff --git a/stage/plugins/pageeffects/iriswipe/CMakeLists.txt b/stage/plug=
ins/pageeffects/iriswipe/CMakeLists.txt
index 156feba..00dd52b 100644
--- a/stage/plugins/pageeffects/iriswipe/CMakeLists.txt
+++ b/stage/plugins/pageeffects/iriswipe/CMakeLists.txt
@@ -30,4 +30,4 @@ target_link_libraries(
     Qt5::Gui    =

     )
 =

-install(TARGETS kpr_pageeffect_iriswipe  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kpr_pageeffect_iriswipe  DESTINATION ${CALLIGRA_PLUGIN_INS=
TALL_DIR})
diff --git a/stage/plugins/pageeffects/matrixwipe/CMakeLists.txt b/stage/pl=
ugins/pageeffects/matrixwipe/CMakeLists.txt
index 45354e9..2bfec92 100644
--- a/stage/plugins/pageeffects/matrixwipe/CMakeLists.txt
+++ b/stage/plugins/pageeffects/matrixwipe/CMakeLists.txt
@@ -47,4 +47,4 @@ target_link_libraries(
     Qt5::Gui
     )
 =

-install(TARGETS kpr_pageeffect_matrixwipe  DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS kpr_pageeffect_matrixwipe  DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
diff --git a/stage/plugins/pageeffects/slidewipe/CMakeLists.txt b/stage/plu=
gins/pageeffects/slidewipe/CMakeLists.txt
index 90cf9e2..84f711f 100644
--- a/stage/plugins/pageeffects/slidewipe/CMakeLists.txt
+++ b/stage/plugins/pageeffects/slidewipe/CMakeLists.txt
@@ -27,4 +27,4 @@ target_link_libraries(
     Qt5::Gui    =

     )
 =

-install(TARGETS kpr_pageeffect_slidewipe  DESTINATION ${PLUGIN_INSTALL_DIR=
})
+install(TARGETS kpr_pageeffect_slidewipe  DESTINATION ${CALLIGRA_PLUGIN_IN=
STALL_DIR})
diff --git a/stage/plugins/pageeffects/spacerotation/CMakeLists.txt b/stage=
/plugins/pageeffects/spacerotation/CMakeLists.txt
index d7f7abe..eb5ed84 100644
--- a/stage/plugins/pageeffects/spacerotation/CMakeLists.txt
+++ b/stage/plugins/pageeffects/spacerotation/CMakeLists.txt
@@ -22,4 +22,4 @@ target_link_libraries(
     Qt5::Gui
     )
 =

-install(TARGETS kpr_pageeffect_spacerotation  DESTINATION ${PLUGIN_INSTALL=
_DIR})
+install(TARGETS kpr_pageeffect_spacerotation  DESTINATION ${CALLIGRA_PLUGI=
N_INSTALL_DIR})
diff --git a/stage/plugins/pageeffects/swapeffect/CMakeLists.txt b/stage/pl=
ugins/pageeffects/swapeffect/CMakeLists.txt
index 007d80c..56ceeb3 100644
--- a/stage/plugins/pageeffects/swapeffect/CMakeLists.txt
+++ b/stage/plugins/pageeffects/swapeffect/CMakeLists.txt
@@ -19,4 +19,4 @@ target_link_libraries(
     Qt5::Gui
     )
 =

-install(TARGETS kpr_pageeffect_swapeffect  DESTINATION ${PLUGIN_INSTALL_DI=
R})
+install(TARGETS kpr_pageeffect_swapeffect  DESTINATION ${CALLIGRA_PLUGIN_I=
NSTALL_DIR})
diff --git a/stage/plugins/shapeanimations/example/CMakeLists.txt b/stage/p=
lugins/shapeanimations/example/CMakeLists.txt
index c377f2a..b3af1e4 100644
--- a/stage/plugins/shapeanimations/example/CMakeLists.txt
+++ b/stage/plugins/shapeanimations/example/CMakeLists.txt
@@ -13,4 +13,4 @@ target_link_libraries(
     Qt5::Core
     )
 =

-install(TARGETS kpr_shapeanimation_example  DESTINATION ${PLUGIN_INSTALL_D=
IR})
+install(TARGETS kpr_shapeanimation_example  DESTINATION ${CALLIGRA_PLUGIN_=
INSTALL_DIR})
diff --git a/stage/plugins/variable/CMakeLists.txt b/stage/plugins/variable=
/CMakeLists.txt
index 6243ff0..64be0f4 100644
--- a/stage/plugins/variable/CMakeLists.txt
+++ b/stage/plugins/variable/CMakeLists.txt
@@ -18,4 +18,4 @@ target_link_libraries(
     Qt5::Core
     )
 =

-install(TARGETS kprvariables  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kprvariables  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
diff --git a/words/part/CMakeLists.txt b/words/part/CMakeLists.txt
index 80323bc..e519b2f 100644
--- a/words/part/CMakeLists.txt
+++ b/words/part/CMakeLists.txt
@@ -165,7 +165,7 @@ kcoreaddons_desktop_to_json(wordspart wordspart.desktop)
 =

 target_link_libraries(wordspart   wordsprivate )
 =

-install(TARGETS wordspart  DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS wordspart  DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 =

 ########### install files ###############
@@ -209,7 +209,7 @@ add_library(authorpart MODULE ${authorpart_PART_SRCS})
 =

 target_link_libraries(authorpart   wordsprivate )
 =

-install(TARGETS authorpart DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS authorpart DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR})
 =

 ########### Author exe ###############
 =

diff --git a/words/plugins/scripting/CMakeLists.txt b/words/plugins/scripti=
ng/CMakeLists.txt
index 98f4cdf..776e778 100644
--- a/words/plugins/scripting/CMakeLists.txt
+++ b/words/plugins/scripting/CMakeLists.txt
@@ -22,6 +22,6 @@ qt5_wrap_cpp(krossmodulewords_PART_SRCS
 =

 add_library(krossmodulewords MODULE ${krossmodulewords_PART_SRCS})
 target_link_libraries(krossmodulewords kokross wordsprivate)
-install(TARGETS krossmodulewords DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS krossmodulewords DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR=
})
 install(FILES krossmodulewords.desktop DESTINATION ${SERVICES_INSTALL_DIR}=
/calligra)
 install(FILES scripting.rc DESTINATION ${DATA_INSTALL_DIR}/words/kpartplug=
ins)
[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic