From 10daf3b9c692518b21d8cdc4c027214743468193 Mon Sep 17 00:00:00 2001 From: sehraf Date: Sat, 28 Apr 2018 09:06:10 +0200 Subject: [PATCH] Fix 'make install' 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 4876a0ea3b87abfe7c404f4bc5fbb43c44577820 --- retroshare.pri | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/retroshare.pri b/retroshare.pri index c4f47aedf..ed0e3c221 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -325,14 +325,6 @@ profiling { 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 # ################################################################################ @@ -463,3 +455,10 @@ macx-* { CONFIG += c++11 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}