From a38405a8e0b6b17bf0a728c2ac1ab066172fc818 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 25 Jun 2019 12:09:30 +0300 Subject: [PATCH] Follow given prefix. User can specify prefix, we should follow it. --HG-- branch : develop --- src/app/tape/tape.pro | 2 +- src/app/valentina/valentina.pro | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 30eeb98f2..e1fc4eabf 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -203,7 +203,7 @@ unix{ # Path to bin file after installation target.path = $$PREFIX/bin - rcc_diagrams.path = /usr/share/valentina/ + rcc_diagrams.path = $$PREFIX/share/valentina/ rcc_diagrams.files = $${OUT_PWD}/$${DESTDIR}/diagrams.rcc rcc_diagrams.CONFIG = no_check_exist diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 592efadd2..536f5743f 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -158,12 +158,12 @@ unix{ tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape # .desktop file - desktop.path = /usr/share/applications/ + desktop.path = $$PREFIX/share/applications/ desktop.files += ../../../dist/$${TARGET}.desktop \ desktop.files += ../../../dist/tape.desktop # logo - pixmaps.path = /usr/share/pixmaps/ + pixmaps.path = $$PREFIX/share/pixmaps/ pixmaps.files += \ ../../../dist/$${TARGET}.png \ ../../../dist/tape.png \ @@ -172,19 +172,19 @@ unix{ ../../../dist/application-x-valentina-s-measurements.png \ # Path to translation files after installation - translations.path = /usr/share/$${TARGET}/translations/ + translations.path = $$PREFIX/share/$${TARGET}/translations/ translations.files = $$INSTALL_TRANSLATIONS # Path to multisize measurement after installation - multisize.path = /usr/share/$${TARGET}/tables/multisize/ + multisize.path = $$PREFIX/share/$${TARGET}/tables/multisize/ multisize.files = $$INSTALL_MULTISIZE_MEASUREMENTS # Path to templates after installation - templates.path = /usr/share/$${TARGET}/tables/templates/ + templates.path = $$PREFIX/share/$${TARGET}/tables/templates/ templates.files = $$INSTALL_STANDARD_TEMPLATES # Path to label templates after installation - label.path = /usr/share/$${TARGET}/labels/ + label.path = $$PREFIX/share/$${TARGET}/labels/ label.files = $$INSTALL_LABEL_TEMPLATES INSTALLS += \