This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdriveclient.
commit 68410bf7a9d0199a8d569f45032f1b846b0874de
Author: Mihai Moldovan <io...@ionic.de>
Date: Fri Feb 24 18:44:31 2023 +0100
x2gokdriveclient.spec: add PREFIX to make call.
---
debian/changelog | 1 +
x2gokdriveclient.spec | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 43f4fd7..6918ea8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -104,6 +104,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
- res/resource.qrc: reference subdirectories.
- x2gokdriveclient.spec: move make_call macro invocation to correct
location. It previously only triggered for non-existent Qt6 builds.
+ - x2gokdriveclient.spec: add PREFIX to make call.
* debian/rules:
+ Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them.
Especially needed for C++11 support.
diff --git a/x2gokdriveclient.spec b/x2gokdriveclient.spec
index b706196..3953f63 100644
--- a/x2gokdriveclient.spec
+++ b/x2gokdriveclient.spec
@@ -121,7 +121,7 @@ test -f ChangeLog.gitlog && cp ChangeLog.gitlog
res/txt/git-info || true
%build
-%define make_call make %{?_smp_mflags} CXXFLAGS='%{optflags}'
QMAKE_OPTS='QMAKE_STRIP=:' QT_VERSION='%{qt_version}'
+%define make_call make %{?_smp_mflags} CXXFLAGS='%{optflags}'
QMAKE_OPTS='QMAKE_STRIP=:' QT_VERSION='%{qt_version}' PREFIX='%{_prefix}'
%if %{qt_version} == 5
%if 0%{?_qt5_bindir:1}
export 'PATH=%{_qt5_bindir}:'"${PATH}"
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2gokdriveclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
