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

Make RS installable with "make install"

Browse source
This commit is contained in:
AsamK 2015-08-22 20:50:30 +02:00
parent fa54fcefdd
commit 6b7a6e2313
6 changed files with 82 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libretroshare/src/libretroshare.pro
View file

@ -119,10 +119,6 @@ HEADERS += $$PUBLIC_HEADERS
################################# Linux ##########################################
linux-* {
isEmpty(PREFIX) { PREFIX = /usr }
isEmpty(INC_DIR) { INC_DIR = $${PREFIX}/include/retroshare/ }
isEmpty(LIB_DIR) { LIB_DIR = $${PREFIX}/lib/ }
# These two lines fixe compilation on ubuntu natty. Probably a ubuntu packaging error.
INCLUDEPATH += $$system(pkg-config --cflags glib-2.0 | sed -e "s/-I//g")
@ -139,10 +135,6 @@ linux-* {
DEPENDPATH += . $${SSL_DIR} $${UPNP_DIR}
INCLUDEPATH += . $${SSL_DIR} $${UPNP_DIR}
# where to put the shared library itself
target.path = $$LIB_DIR
INSTALLS *= target
SQLCIPHER_OK = $$system(pkg-config --exists sqlcipher && echo yes)
isEmpty(SQLCIPHER_OK) {
# We need a explicit path here, to force using the home version of sqlite3 that really encrypts the database.
@ -155,11 +147,6 @@ linux-* {
}
}
# where to put the librarys interface
include_rsiface.path = $${INC_DIR}
include_rsiface.files = $$PUBLIC_HEADERS
INSTALLS += include_rsiface
#CONFIG += version_detail_bash_script
@ -180,6 +167,22 @@ linux-* {
LIBS *= -lgnome-keyring
}
unix {
isEmpty(PREFIX) { PREFIX = /usr }
isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare06" }
isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }
isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" }
# where to put the librarys interface
include_rsiface.path = "$${INC_DIR}"
include_rsiface.files = $$PUBLIC_HEADERS
INSTALLS += include_rsiface
# where to put the shared library itself
target.path = "$$LIB_DIR"
INSTALLS *= target
}
linux-g++ {
OBJECTS_DIR = temp/linux-g++/obj
}

0
libretroshare/src/retroshare/rsexpr.h Executable file → Normal file
View file