mindforger: 1.48.2 -> 1.52.0

This commit is contained in:
Cyryl Płotnicki
2020-12-30 14:57:25 +00:00
parent 58f3c19b78
commit 31f845840c
2 changed files with 20 additions and 69 deletions
@@ -1,17 +1,8 @@
diff --git a/app/app.pro b/app/app.pro
index 4d47065..a39a320 100644
index 29f9d9e..15fd2ff 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -18,6 +18,8 @@
TARGET = mindforger
TEMPLATE = app
+include(../config.pri)
+
QT += widgets
mfner {
@@ -297,7 +299,7 @@ RESOURCES += \
@@ -370,7 +370,7 @@ RESOURCES += \
# See http://doc.qt.io/qt-5/qmake-advanced-usage.html
binfile.files += mindforger
@@ -20,51 +11,11 @@ index 4d47065..a39a320 100644
INSTALLS += binfile
# ########################################
diff --git a/config.pri b/config.pri
new file mode 100644
index 0000000..ce05df1
--- /dev/null
+++ b/config.pri
@@ -0,0 +1,3 @@
+isEmpty(PREFIX) {
+ PREFIX = /usr
+}
diff --git a/deps/discount/discount.pro b/deps/discount/discount.pro
index a8dfe35..ec16468 100644
--- a/deps/discount/discount.pro
+++ b/deps/discount/discount.pro
@@ -5,6 +5,8 @@
# Webpage: http://www.pell.portland.or.us/~orc/Code/discount/
#
+include(../../config.pri)
+
QT -= core gui
TARGET = discount
@@ -46,7 +48,7 @@ unix:!symbian {
maemo5 {
target.path = /opt/usr/lib
} else {
- target.path = /usr/lib
+ target.path = $$PREFIX/lib
}
INSTALLS += target
}
diff --git a/mindforger.pro b/mindforger.pro
index ae627f2..0953856 100644
index bd4f21d..6bb2dbc 100644
--- a/mindforger.pro
+++ b/mindforger.pro
@@ -32,6 +32,8 @@ TEMPLATE = subdirs
SUBDIRS = deps lib app
+include(config.pri)
+
# build dependencies
lib.depends = deps
app.depends = lib
@@ -44,20 +46,20 @@ app.depends = lib
@@ -43,20 +43,20 @@ app.depends = lib
#IMPORTANT: binfile MUST be specified in app/app.pro (project next to/that builds binary)
docfiles.files += doc/*