summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 20:40:00 (UTC)
committer kergoth <kergoth>2002-11-05 20:40:00 (UTC)
commit45e2855a515926495e28612747d4311959042751 (patch) (side-by-side diff)
tree2bddf4a6710f8d47cbc621b1ea16c18e0ad35e73
parent8e8ffc20d1699ba678d380f25e08424492f7d8ab (diff)
downloadopie-45e2855a515926495e28612747d4311959042751.zip
opie-45e2855a515926495e28612747d4311959042751.tar.gz
opie-45e2855a515926495e28612747d4311959042751.tar.bz2
Dont obey qtdir, obey hostqtdir. set it if necessary
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--scripts/kconfig/Makefile14
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,18 +1,18 @@
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)
@@ -105,9 +105,9 @@ conf: $(conf_OBJ)
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)
@@ -139,9 +139,9 @@ tgz:
lex.%.c: %.l
$(LEX) $(LFLAGS) -P$* $<
%.moc: %.h
- $(QTDIR)/bin/moc -i $< -o $@
+ $(HOSTQTDIR)/bin/moc -i $< -o $@
%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@