aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Default prefix must be defined before first use. Added new preprocessor macros value BINDIR. #56

Browse Source
This commit is contained in:
Roman Telezhynskyi 2020-07-13 16:07:45 +03:00
parent 1cc565686d
commit ee29874543
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common.pri
View File

@ -20,14 +20,18 @@ unix{
VCOPY = $$QMAKE_COPY -u VCOPY = $$QMAKE_COPY -u
} }
# Default prefix. Use for creation install path.
DEFAULT_PREFIX = /usr
# Prefix for binary file. # Prefix for binary file.
isEmpty(PREFIX){ isEmpty(PREFIX){
PREFIX = $$DEFAULT_PREFIX PREFIX = $$DEFAULT_PREFIX
} }
BINDIR = $$PREFIX/bin
DATADIR = $$PREFIX/share DATADIR = $$PREFIX/share
PKGDATADIR = $$DATADIR/valentina PKGDATADIR = $$DATADIR/valentina
DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" DEFINES += BINDIR=\\\"$$BINDIR\\\" DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
} }
win32{ win32{
@ -319,9 +323,6 @@ defineReplace(FindLatestTagDistance){
} }
} }
# Default prefix. Use for creation install path.
DEFAULT_PREFIX = /usr
# In debug mode on Unix system we use all usefull for us compilers keys for checking errors. # In debug mode on Unix system we use all usefull for us compilers keys for checking errors.
# Also trying make all possible for speed up build time. # Also trying make all possible for speed up build time.
unix { unix {

2
src/app/tape/tape.pro
View File

@ -193,7 +193,7 @@ include(../translations.pri)
unix{ unix{
!macx{ !macx{
# Path to bin file after installation # Path to bin file after installation
target.path = $$PREFIX/bin target.path = $$BINDIR
rcc_diagrams.path = $$PKGDATADIR rcc_diagrams.path = $$PKGDATADIR
rcc_diagrams.files = $${OUT_PWD}/$${DESTDIR}/diagrams.rcc rcc_diagrams.files = $${OUT_PWD}/$${DESTDIR}/diagrams.rcc

4
src/app/valentina/valentina.pro
View File

@ -144,9 +144,9 @@ include(../translations.pri)
unix{ unix{
!macx{ !macx{
# Path to bin file after installation # Path to bin file after installation
target.path = $$PREFIX/bin target.path = $$BINDIR
tape.path = $$PREFIX/bin tape.path = $$BINDIR
tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape
# .desktop file # .desktop file