mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-05 09:35:39 -05:00
Merge pull request #1492 from shibe2/patch-1
remove accidental code from retroshare_plugin.pri
This commit is contained in:
commit
8f953c0e3c
@ -16,9 +16,6 @@
|
|||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
|
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
TEMPLATE = subdirs
|
|
||||||
|
|
||||||
SUBDIRS += \
|
|
||||||
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
|
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
|
||||||
|
|
||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
@ -28,9 +25,6 @@ DEPENDPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
|
|||||||
INCLUDEPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
|
INCLUDEPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
|
||||||
|
|
||||||
linux-* {
|
linux-* {
|
||||||
# Cyril: Someone can explain to me why I need to put that again here??? Normally this variable should be set by
|
|
||||||
# the include of retroshare.pri, but for some reason it is not!
|
|
||||||
isEmpty(RS_PLUGIN_DIR): RS_PLUGIN_DIR = "$${PREFIX}/lib/retroshare/extensions6"
|
|
||||||
target.path = "$${RS_PLUGIN_DIR}"
|
target.path = "$${RS_PLUGIN_DIR}"
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user