diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-11-21 12:14:44 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-11-21 12:14:44 +0300 |
| commit | 15d74d80363d3cc4a8f48fb43e90e9fd7cfc2e97 (patch) | |
| tree | 6417e2c4eed0ac6366c6130a867b8a4cdef1f6e2 | |
| parent | 41a3238d00a60521bd7aa8edb08cbd198f193aa1 (diff) | |
| download | qtbase-15d74d80363d3cc4a8f48fb43e90e9fd7cfc2e97.tar.gz | |
Fix build
| -rw-r--r-- | debian/qt5-qmake.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake.install index c00a21e..9752f1c 100644 --- a/debian/qt5-qmake.install +++ b/debian/qt5-qmake.install @@ -1,3 +1,3 @@ usr/bin/*-qmake usr/lib/*/qt5/mkspecs/ -usr/lib/*/qt5/qmake.conf +usr/lib/*/qt5/qt.conf diff --git a/debian/rules b/debian/rules index aab665e..860f2c4 100755 --- a/debian/rules +++ b/debian/rules @@ -121,7 +121,7 @@ override_dh_auto_configure: touch Makefile override_dh_auto_clean: - [ ! -f Makefile ] || $(MAKE) confclean distclean + [ ! -f Makefile ] || $(MAKE) confclean distclean || true # Extra stuff missed by confclean/distclean @@ -262,6 +262,7 @@ endif echo "HostBinaries=lib/qt5/bin" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf echo "Headers=include/$(DEB_HOST_MULTIARCH)/qt5" >> debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf + mkdir -p debian/tmp/usr/bin echo "#!/bin/sh" > debian/tmp/usr/bin/$(DEB_HOST_GNU_TYPE)-qmake echo "exec /usr/lib/qt5/bin/qmake" \ "-qtconf /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qt.conf" \ |