Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 00:19:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 'make install'

Browse Source 
Since DATA_DIR (and the others) are not set 'make install' will move the files to /{qss, sounds, stylesheets, usr, webui} (instead of '/usr/...')
Fixes 4876a0ea3b
This commit is contained in:
sehraf 2018-04-28 09:06:10 +02:00
parent be75e89ad2
commit 10daf3b9c6
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
retroshare.pri
View File

@ -325,14 +325,6 @@ profiling {
QMAKE_LFLAGS *= -pg QMAKE_LFLAGS *= -pg
} }
## Retrocompatibility assignations, get rid of this ASAP
isEmpty(BIN_DIR) : BIN_DIR = $${RS_BIN_DIR}
isEmpty(INC_DIR) : INC_DIR = $${RS_INCLUDE_DIR}
isEmpty(LIBDIR) : LIBDIR = $${QMAKE_LIBDIR}
isEmpty(DATA_DIR) : DATA_DIR = $${RS_DATA_DIR}
isEmpty(PLUGIN_DIR): PLUGIN_DIR= $${RS_PLUGIN_DIR}
################################################################################ ################################################################################
## Last goes platform specific statements common to all RetroShare subprojects # ## Last goes platform specific statements common to all RetroShare subprojects #
################################################################################ ################################################################################
@ -463,3 +455,10 @@ macx-* {
CONFIG += c++11 CONFIG += c++11
RS_UPNP_LIB = miniupnpc RS_UPNP_LIB = miniupnpc
} }
## Retrocompatibility assignations, get rid of this ASAP
isEmpty(BIN_DIR) : BIN_DIR = $${RS_BIN_DIR}
isEmpty(INC_DIR) : INC_DIR = $${RS_INCLUDE_DIR}
isEmpty(LIBDIR) : LIBDIR = $${QMAKE_LIBDIR}
isEmpty(DATA_DIR) : DATA_DIR = $${RS_DATA_DIR}
isEmpty(PLUGIN_DIR): PLUGIN_DIR= $${RS_PLUGIN_DIR}