Skip to content

Commit 5ebf8ef

Browse files
yurivictiakov
authored andcommitted
Fix install paths by adding INSTALL_PREFIX
Otherwise install and lib folders are installed into root.
1 parent a2b967d commit 5ebf8ef

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
echo ============================
5656
qmake -r PythonQt.pro CONFIG+=release CONFIG+=sanitizer CONFIG+=sanitize_undefined \
5757
PYTHON_VERSION=$(python3 --version | cut -d " " -f 2 | cut -d "." -f1,2) \
58-
PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
58+
PYTHON_PATH=$(which python3 | xargs dirname)
5959
make -j 2 && make check TESTARGS="-platform offscreen"
6060
6161
- name: Generate Wrappers
@@ -115,7 +115,7 @@ jobs:
115115
echo ============================
116116
qmake-qt5 -r PythonQt.pro CONFIG+=release \
117117
PYTHON_VERSION=$(python --version | cut -d " " -f 2 | cut -d "." -f1,2) \
118-
PYTHON_DIR=$(which python | xargs dirname | xargs dirname)
118+
PYTHON_PATH=$(which python | xargs dirname)
119119
make -j 2 && make check TESTARGS="-platform offscreen"
120120
121121
- name: Generate Wrappers
@@ -197,7 +197,7 @@ jobs:
197197
do if pkg-config --exists "$i"; then PYTHON_PKGCONFIG_NAME="$i"; break; fi; done
198198
qmake CONFIG+=release CONFIG+=sanitizer CONFIG+=sanitize_undefined \
199199
PYTHON_VERSION=${{ steps.versions.outputs.PYTHON_VERSION_SHORT }} \
200-
PYTHON_DIR="$pythonLocation" \
200+
PYTHON_PATH="$pythonLocation" \
201201
PKGCONFIG+=$PYTHON_PKGCONFIG_NAME \
202202
-r PythonQt.pro
203203
make -j 2 && make check TESTARGS="-platform offscreen"

extensions/PythonQt_QtAll/PythonQt_QtAll.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ unix {
5656
QMAKE_PKGCONFIG_VERSION = $$VERSION
5757
}
5858

59-
unix: target.path = /lib
59+
unix: target.path = $${INSTALL_PREFIX}/lib
6060
win32: target.path = /
6161

6262
headers.files = $${HEADERS}
63-
headers.path = /include
63+
headers.path = $${INSTALL_PREFIX}/include
6464

6565
INSTALLS += target headers
6666

src/src.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ unix {
5757
QMAKE_PKGCONFIG_VERSION = $$VERSION
5858
}
5959

60-
unix: target.path = /lib
60+
unix: target.path = $${INSTALL_PREFIX}/lib
6161
win32: target.path = /
6262

6363
headers.files = $${HEADERS} $$PWD/PythonQtPythonInclude.h
64-
headers.path = /include
64+
headers.path = $${INSTALL_PREFIX}/include
6565

6666
INSTALLS += target headers

0 commit comments

Comments
 (0)