Skip to content

Commit

Permalink
Use KDEInstallDir variables instead of custom calculated install paths
Browse files Browse the repository at this point in the history
Summary:
Consistent usage of install variables avoids mismatches for people who
make use of custom settings of install paths.

Reviewers: davidedmundson, broulik, apol

Reviewed By: apol

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D11402
  • Loading branch information
kossebau committed Mar 17, 2018
1 parent f2e19ff commit 60bcbd3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if(INSTALL_CHROME_EXTENSION)
# The actual extension file
# TODO would be nice if we could automate the packaging and generation of the crx
# TODO do we need to use some form of KDE_INSTALL_TARGETS_DEFAULT_ARGS?
install(FILES extension.crx DESTINATION ${CMAKE_INSTALL_PREFIX}/share/plasma-browser-integration)
install(FILES extension.crx DESTINATION ${KDE_INSTALL_DATADIR}/plasma-browser-integration)

elseif (INSTALL_CHROME_MANIFEST) # Install a policy to have browsers automatically add the extension

Expand Down
2 changes: 1 addition & 1 deletion chrome_install_locally_policy.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"external_crx": "@CMAKE_INSTALL_PREFIX@/share/plasma-browser-integration/extension.crx",
"external_crx": "@KDE_INSTALL_FULL_DATADIR@/plasma-browser-integration/extension.crx",
"external_version": "@PROJECT_VERSION@"
}
2 changes: 1 addition & 1 deletion org.kde.plasma.chrome_integration.json.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "org.kde.plasma.browser_integration",
"description": "Native connector for KDE Plasma",
"path": "@CMAKE_INSTALL_PREFIX@/bin/plasma-browser-integration-host",
"path": "@KDE_INSTALL_FULL_BINDIR@/plasma-browser-integration-host",
"type": "stdio",
"allowed_origins": [
"chrome-extension://@CHROME_EXTENSION_ID@/"
Expand Down
2 changes: 1 addition & 1 deletion org.kde.plasma.firefox_integration.json.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "org.kde.plasma.browser_integration",
"description": "Native connector for KDE Plasma",
"path": "@CMAKE_INSTALL_PREFIX@/bin/plasma-browser-integration-host",
"path": "@KDE_INSTALL_FULL_BINDIR@/plasma-browser-integration-host",
"type": "stdio",
"allowed_extensions": ["[email protected]"]
}

0 comments on commit 60bcbd3

Please sign in to comment.