From 1bdbf52d0506aba37e6e3035929c6bb38cac76eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 6 Dec 2021 17:25:12 +0100 Subject: [PATCH] DEB python-tqt: Update paths for TQScintilla built using CMake. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit f5160fc35b46b92fb143887980e30c2f3d01b567) --- debian/_base/dependencies/python-tqt/debian/rules | 8 ++++---- ubuntu/_base/dependencies/python-tqt/debian/rules | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/_base/dependencies/python-tqt/debian/rules b/debian/_base/dependencies/python-tqt/debian/rules index 0d9bda729..cf228c2b5 100755 --- a/debian/_base/dependencies/python-tqt/debian/rules +++ b/debian/_base/dependencies/python-tqt/debian/rules @@ -58,9 +58,9 @@ build-%/configure-stamp: mkdir -p build-$* cd build-$* && echo yes \ | python$* ../configure.py \ - -c -n /usr/include/tqscintilla \ + -c -n /usr/include/tqt3 \ -e python$* \ - -o /usr/lib -u -j $(SPLIT) \ + -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -l /usr/include/python$* \ -v /usr/share/sip/tqt \ @@ -73,9 +73,9 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* cd dbg-build-$* && echo yes \ | python$*-dbg ../configure.py \ - -c -n /usr/include/tqscintilla \ + -c -n /usr/include/tqt3 \ -e python$* \ - -o /usr/lib -u -j $(SPLIT) \ + -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -l /usr/include/python$*_d \ -v /usr/share/sip/tqt \ diff --git a/ubuntu/_base/dependencies/python-tqt/debian/rules b/ubuntu/_base/dependencies/python-tqt/debian/rules index 0d9bda729..cf228c2b5 100755 --- a/ubuntu/_base/dependencies/python-tqt/debian/rules +++ b/ubuntu/_base/dependencies/python-tqt/debian/rules @@ -58,9 +58,9 @@ build-%/configure-stamp: mkdir -p build-$* cd build-$* && echo yes \ | python$* ../configure.py \ - -c -n /usr/include/tqscintilla \ + -c -n /usr/include/tqt3 \ -e python$* \ - -o /usr/lib -u -j $(SPLIT) \ + -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -l /usr/include/python$* \ -v /usr/share/sip/tqt \ @@ -73,9 +73,9 @@ dbg-build-%/configure-stamp: mkdir -p dbg-build-$* cd dbg-build-$* && echo yes \ | python$*-dbg ../configure.py \ - -c -n /usr/include/tqscintilla \ + -c -n /usr/include/tqt3 \ -e python$* \ - -o /usr/lib -u -j $(SPLIT) \ + -o /usr/lib/$(DEB_HOST_MULTIARCH) -u -j $(SPLIT) \ -d /usr/lib/python$*/$(call py_sitename,$*)/python_tqt \ -l /usr/include/python$*_d \ -v /usr/share/sip/tqt \