author | kergoth <kergoth> | 2002-11-05 20:40:00 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-05 20:40:00 (UTC) |
commit | 45e2855a515926495e28612747d4311959042751 (patch) (unidiff) | |
tree | 2bddf4a6710f8d47cbc621b1ea16c18e0ad35e73 /scripts | |
parent | 8e8ffc20d1699ba678d380f25e08424492f7d8ab (diff) | |
download | opie-45e2855a515926495e28612747d4311959042751.zip opie-45e2855a515926495e28612747d4311959042751.tar.gz opie-45e2855a515926495e28612747d4311959042751.tar.bz2 |
Dont obey qtdir, obey hostqtdir. set it if necessary
-rw-r--r-- | scripts/kconfig/Makefile | 14 |
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 | |||
@@ -3,14 +3,14 @@ CC=gcc | |||
3 | CXX=g++ | 3 | CXX=g++ |
4 | CFLAGS=-O2 -Wall -g -fPIC | 4 | CFLAGS=-O2 -Wall -g -fPIC |
5 | CXXFLAGS=$(CFLAGS) -I$(QTDIR)/include | 5 | CXXFLAGS=$(CFLAGS) -I$(HOSTQTDIR)/include |
6 | LDFLAGS= | 6 | LDFLAGS= |
7 | LXXFLAGS=$(LDFLAGS) -L$(QTDIR)/lib -Wl,-rpath,$(QTDIR)/lib | 7 | LXXFLAGS=$(LDFLAGS) -L$(HOSTQTDIR)/lib -Wl,-rpath,$(HOSTQTDIR)/lib |
8 | LEX=flex | 8 | LEX=flex |
9 | YACC=bison | 9 | YACC=bison |
10 | YFLAGS=-d -t -v | 10 | YFLAGS=-d -t -v |
11 | ifndef QTDIR | 11 | ifndef HOSTQTDIR |
12 | QTDIR=/usr/share/qt | 12 | HOSTQTDIR=/usr/share/qt |
13 | endif | 13 | endif |
14 | MOC=$(wildcard $(QTDIR)/bin/moc) | 14 | MOC=$(wildcard $(HOSTQTDIR)/bin/moc) |
15 | 15 | ||
16 | parse_SRC=zconf.y | 16 | parse_SRC=zconf.y |
@@ -107,5 +107,5 @@ ifeq ($(MOC),) | |||
107 | qconf: | 107 | 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. |
111 | @false | 111 | @false |
@@ -141,5 +141,5 @@ lex.%.c: %.l | |||
141 | 141 | ||
142 | %.moc: %.h | 142 | %.moc: %.h |
143 | $(QTDIR)/bin/moc -i $< -o $@ | 143 | $(HOSTQTDIR)/bin/moc -i $< -o $@ |
144 | 144 | ||
145 | %.o: %.c | 145 | %.o: %.c |