diff options
-rw-r--r-- | scripts/kconfig/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index cef3f75e1c2b..996059ef1c4d 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -273,12 +273,10 @@ $(obj)/.tmp_qtcheck: | |||
273 | moc="/usr/bin/moc"; \ | 273 | moc="/usr/bin/moc"; \ |
274 | fi; \ | 274 | fi; \ |
275 | else \ | 275 | else \ |
276 | headerpath="\$$(shell qmake -query QT_INSTALL_HEADERS)"; \ | 276 | cflags="\$$(shell pkg-config QtCore --cflags) \$$(shell pkg-config QtGui --cflags) \$$(shell pkg-config Qt3Support --cflags)"; \ |
277 | libpath="\$$(shell qmake -query QT_INSTALL_LIBS)"; \ | 277 | libs="\$$(shell pkg-config QtCore --libs) \$$(shell pkg-config QtGui --libs) \$$(shell pkg-config Qt3Support --libs)"; \ |
278 | binpath="\$$(shell qmake -query QT_INSTALL_BINS)"; \ | 278 | binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \ |
279 | cflags="-I$$headerpath -I$$headerpath/QtCore -I$$headerpath/QtGui -I$$headerpath/Qt3Support -DQT3_SUPPORT"; \ | 279 | moc="$$binpath/bin/moc"; \ |
280 | libs="-L$$libpath -Wl,-rpath,$$libpath -lQtCore -lQtGui -lQt3Support"; \ | ||
281 | moc="$$binpath/moc"; \ | ||
282 | fi; \ | 280 | fi; \ |
283 | echo "KC_QT_CFLAGS=$$cflags" > $@; \ | 281 | echo "KC_QT_CFLAGS=$$cflags" > $@; \ |
284 | echo "KC_QT_LIBS=$$libs" >> $@; \ | 282 | echo "KC_QT_LIBS=$$libs" >> $@; \ |