Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-13 11:32:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1243 from sehraf/pr_fix-make-install

Browse source 
Fix 'make install'
This commit is contained in:
G10h4ck 2018-04-28 09:33:14 +02:00 • committed by GitHub
commit ccede9ddd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
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}