diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2002-12-15 00:03:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-15 00:03:47 -0800 |
| commit | ae1039c225cb8dee097df7fd821603ecef705827 (patch) | |
| tree | d7108c06ed970f53b901b8f3e05f9127f1f2fb99 | |
| parent | 1b3bacb52c38b3224ca2adb893569108fadd38ec (diff) | |
[PATCH] kconfig: qt installation workaround
Work around broken mandrake qt installation, which doesn't have a $QTDIR/bin/moc.
| -rw-r--r-- | scripts/kconfig/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index edbd74cf8092..a6ebd0173b02 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -33,12 +33,13 @@ $(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o: $(obj)/zconf.tab.h $(obj)/qconf.o: $(obj)/.tmp_qtcheck ifeq ($(MAKECMDGOALS),$(obj)/qconf) +MOC = $(QTDIR)/bin/moc -include $(obj)/.tmp_qtcheck # QT needs some extra effort... $(obj)/.tmp_qtcheck: @set -e; for d in $$QTDIR /usr/share/qt /usr/lib/qt3; do \ - if [ -x $$d/bin/moc ]; then DIR=$$d; break; fi; \ + if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \ done; \ if [ -z "$$DIR" ]; then \ echo "*"; \ @@ -50,7 +51,13 @@ $(obj)/.tmp_qtcheck: fi; \ LIB=qt; \ if [ -f $$DIR/lib/libqt-mt.so ]; then LIB=qt-mt; fi; \ - echo "QTDIR=$$DIR" > $@; echo "QTLIB=$$LIB" >> $@ + echo "QTDIR=$$DIR" > $@; echo "QTLIB=$$LIB" >> $@; \ + if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \ + echo "*"; \ + echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \ + echo "*"; \ + echo "MOC=/usr/bin/moc" >> $@; \ + fi endif $(obj)/zconf.tab.o: $(obj)/lex.zconf.c @@ -60,7 +67,7 @@ $(obj)/kconfig_load.o: $(obj)/lkc_defs.h $(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h $(obj)/%.moc: $(src)/%.h - $(QTDIR)/bin/moc -i $< -o $@ + $(MOC) -i $< -o $@ $(obj)/lkc_defs.h: $(src)/lkc_proto.h sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/' |