diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2012-07-04 15:23:29 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-07-13 14:27:13 +0200 |
| commit | 48485949b4d44a24c81caf9ab4dc32005f3aa67e (patch) | |
| tree | e039f8a0de80b688bf5fc7689795752c95fb34fe /scripts | |
| parent | 3725f3ed1246301059eaa1c978ad7133fe567433 (diff) | |
| download | linux-48485949b4d44a24c81caf9ab4dc32005f3aa67e.tar.bz2 | |
xconfig: use pkgconfig to find moc
Various schemes exist to allow parallel installations of multiple major
versions of Qt (4.x with the previous 3.x and/or the upcoming 5.x).
QtCore.pc includes a moc_location variable which should be a more reliable
way to find moc.
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 79662658fb91..5e2176cba4a6 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -260,8 +260,8 @@ $(obj)/.tmp_qtcheck: else \ cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \ libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \ - binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \ - moc="$$binpath/bin/moc"; \ + moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \ + [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \ fi; \ echo "KC_QT_CFLAGS=$$cflags" > $@; \ echo "KC_QT_LIBS=$$libs" >> $@; \ |