Dont obey qtdir, obey hostqtdir. set it if necessary

1 files changed, 7 insertions, 7 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index ed57c6f..b60db9f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -1,20 +1,20 @@
 VERSION=1.2
 CC=gcc
 CXX=g++
 CFLAGS=-O2 -Wall -g -fPIC
-CXXFLAGS=$(CFLAGS) -I$(QTDIR)/include
+CXXFLAGS=$(CFLAGS) -I$(HOSTQTDIR)/include
 LDFLAGS=
-LXXFLAGS=$(LDFLAGS) -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib
+LXXFLAGS=$(LDFLAGS) -L$(HOSTQTDIR)/lib -Wl,-rpath,$(HOSTQTDIR)/lib
 LEX=flex
 YACC=bison
 YFLAGS=-d -t -v
-ifndef QTDIR
-QTDIR=/usr/share/qt
+ifndef HOSTQTDIR
+HOSTQTDIR=/usr/share/qt
 endif
-MOC=$(wildcard $(QTDIR)/bin/moc)
+MOC=$(wildcard $(HOSTQTDIR)/bin/moc)
 
 parse_SRC=zconf.y
 conf_SRC=conf.c $(parse_SRC)
 mconf_SRC=mconf.c $(parse_SRC)
 qconf_SRC=qconf.cc
 lkcc_SRC=cml1.y cml1.l help.l cml1.h expr1.c
@@ -103,13 +103,13 @@ mconf: $(mconf_OBJ)
 conf: $(conf_OBJ)
 	$(CC) $(LDFLAGS) $^ -o $@
 
 ifeq ($(MOC),)
 qconf:
 	@echo Unable to find the QT installation. Please make sure that the
-	@echo QT development package is correctly installed and the QTDIR
+	@echo QT development package is correctly installed and the HOSTQTDIR
 	@echo environment variable is set to the correct location.
 	@false
 else
 qconf: $(qconf_OBJ)
 	$(CXX) $(LXXFLAGS) $^ -lqt -o $@
 endif
@@ -137,13 +137,13 @@ tgz:
 	$(YACC) $(YFLAGS) -b $* -p $* $<
 
 lex.%.c: %.l
 	$(LEX) $(LFLAGS) -P$* $<
 
 %.moc: %.h
-	$(QTDIR)/bin/moc -i $< -o $@
+	$(HOSTQTDIR)/bin/moc -i $< -o $@
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
 %.o: %.cc
 	$(CXX) $(CXXFLAGS) -c $< -o $@