mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-12 16:09:37 -05:00
Make RS installable with "make install"
This commit is contained in:
parent
fa54fcefdd
commit
6b7a6e2313
@ -11,3 +11,42 @@ SUBDIRS += \
|
||||
retroshare-gui/src/retroshare-gui.pro \
|
||||
retroshare-nogui/src/retroshare-nogui.pro \
|
||||
plugins/plugins.pro
|
||||
|
||||
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" }
|
||||
|
||||
icon_24_files.path = "$${PREFIX}/share/icons/hicolor/24x24/apps"
|
||||
icon_24_files.files = build_scripts/Debian+Ubuntu/data/24x24/*
|
||||
INSTALLS += icon_24_files
|
||||
|
||||
icon_48_files.path = "$${PREFIX}/share/icons/hicolor/48x48/apps"
|
||||
icon_48_files.files = build_scripts/Debian+Ubuntu/data/48x48/*
|
||||
INSTALLS += icon_48_files
|
||||
|
||||
icon_64_files.path = "$${PREFIX}/share/icons/hicolor/64x64/apps"
|
||||
icon_64_files.files = build_scripts/Debian+Ubuntu/data/64x64/*
|
||||
INSTALLS += icon_64_files
|
||||
|
||||
desktop_files.path = "$${PREFIX}/share/applications"
|
||||
desktop_files.files = build_scripts/Debian+Ubuntu/retroshare.desktop
|
||||
INSTALLS += desktop_files
|
||||
|
||||
pixmap_files.path = "$${PREFIX}/share/pixmaps"
|
||||
pixmap_files.files = build_scripts/Debian+Ubuntu/retroshare.xpm
|
||||
INSTALLS += pixmap_files
|
||||
|
||||
data_files.path = "$${DATA_DIR}"
|
||||
data_files.files = libbitdht/src/bitdht/bdboot.txt
|
||||
INSTALLS += data_files
|
||||
|
||||
webui_files.path = "$${DATA_DIR}/webui"
|
||||
webui_files.files = libresapi/src/webfiles/*
|
||||
INSTALLS += webui_files
|
||||
|
||||
webui_img_files.path = "$${DATA_DIR}/webui/img"
|
||||
webui_img_files.files = retroshare-gui/src/gui/images/logo/logo_splash.png
|
||||
INSTALLS += webui_img_files
|
||||
}
|
||||
|
@ -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
0
libretroshare/src/retroshare/rsexpr.h
Executable file → Normal file
@ -3,6 +3,14 @@ TEMPLATE = lib
|
||||
DEPENDPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
|
||||
INCLUDEPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
|
||||
|
||||
unix {
|
||||
isEmpty(PREFIX) { PREFIX = /usr }
|
||||
isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }
|
||||
|
||||
target.path = "$${LIB_DIR}/retroshare/extensions6"
|
||||
INSTALLS += target
|
||||
}
|
||||
|
||||
linux-g++ {
|
||||
LIBS *= -ldl
|
||||
}
|
||||
|
@ -109,6 +109,18 @@ linux-* {
|
||||
DEFINES *= UBUNTU
|
||||
}
|
||||
|
||||
unix {
|
||||
isEmpty(PREFIX) { PREFIX = /usr }
|
||||
isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" }
|
||||
|
||||
target.path = "$${PREFIX}/bin"
|
||||
INSTALLS += target
|
||||
|
||||
sound_files.path="$${DATA_DIR}/sounds"
|
||||
sound_files.files=sounds/*
|
||||
INSTALLS += sound_files
|
||||
}
|
||||
|
||||
linux-g++ {
|
||||
OBJECTS_DIR = temp/linux-g++/obj
|
||||
}
|
||||
@ -131,12 +143,6 @@ version_detail_bash_script {
|
||||
}
|
||||
}
|
||||
|
||||
install_rs {
|
||||
INSTALLS += binary_rs
|
||||
binary_rs.path = $$(PREFIX)/usr/bin
|
||||
binary_rs.files = ./RetroShare
|
||||
}
|
||||
|
||||
#################### Cross compilation for windows under Linux ###################
|
||||
|
||||
win32-x-g++ {
|
||||
|
@ -55,6 +55,13 @@ linux-* {
|
||||
}
|
||||
}
|
||||
|
||||
unix {
|
||||
isEmpty(PREFIX) { PREFIX = /usr }
|
||||
|
||||
target.path = "$${PREFIX}/bin"
|
||||
INSTALLS += target
|
||||
}
|
||||
|
||||
linux-g++ {
|
||||
OBJECTS_DIR = temp/linux-g++/obj
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user