summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-05 20:40:00 (UTC)
committer kergoth <kergoth>2002-11-05 20:40:00 (UTC)
commit45e2855a515926495e28612747d4311959042751 (patch) (unidiff)
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
@@ -4,5 +4,5 @@ CXX=g++
4CFLAGS=-O2 -Wall -g -fPIC 4CFLAGS=-O2 -Wall -g -fPIC
5CXXFLAGS=$(CFLAGS) -I$(QTDIR)/include 5CXXFLAGS=$(CFLAGS) -I$(HOSTQTDIR)/include
6LDFLAGS= 6LDFLAGS=
7LXXFLAGS=$(LDFLAGS) -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib 7LXXFLAGS=$(LDFLAGS) -L$(HOSTQTDIR)/lib -Wl,-rpath,$(HOSTQTDIR)/lib
8LEX=flex 8LEX=flex
@@ -10,6 +10,6 @@ YACC=bison
10YFLAGS=-d -t -v 10YFLAGS=-d -t -v
11ifndef QTDIR 11ifndef HOSTQTDIR
12QTDIR=/usr/share/qt 12HOSTQTDIR=/usr/share/qt
13endif 13endif
14MOC=$(wildcard $(QTDIR)/bin/moc) 14MOC=$(wildcard $(HOSTQTDIR)/bin/moc)
15 15
@@ -108,3 +108,3 @@ qconf:
108 @echo Unable to find the QT installation. Please make sure that the 108 @echo Unable to find the QT installation. Please make sure that the
109 @echo QT development package is correctly installed and the QTDIR 109 @echo QT development package is correctly installed and the HOSTQTDIR
110 @echo environment variable is set to the correct location. 110 @echo environment variable is set to the correct location.
@@ -142,3 +142,3 @@ lex.%.c: %.l
142%.moc: %.h 142%.moc: %.h
143 $(QTDIR)/bin/moc -i $< -o $@ 143 $(HOSTQTDIR)/bin/moc -i $< -o $@
144 144