summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make6
1 files changed, 3 insertions, 3 deletions
diff --git a/Vars.make b/Vars.make
index fe4f397..1413282 100644
--- a/Vars.make
+++ b/Vars.make
@@ -1,48 +1,48 @@
1prefix=/opt/QtPalmtop 1prefix=/opt/QtPalmtop
2 2
3ifeq ($(OPIEDIR),) 3ifeq ($(OPIEDIR),)
4 export OPIEDIR:=$(TOPDIR) 4 export OPIEDIR:=$(TOPDIR)
5endif 5endif
6ifeq ($(IPK_DIR),) 6ifeq ($(IPK_DIR),)
7 export IPK_DIR:=$(OPIEDIR) 7 export IPK_DIR:=$(OPIEDIR)
8endif 8endif
9 9
10ifneq ($(wildcard $(TOPDIR)/.config),) 10ifneq ($(wildcard $(TOPDIR)/.config),)
11 include $(TOPDIR)/.config 11 include $(TOPDIR)/.config
12endif 12endif
13 13
14ifndef CONFIG_TARGET_OE 14ifndef CONFIG_TARGET_OE
15 ifndef QTDIR 15 ifndef QTDIR
16 $(error QTDIR not set) 16 $(error QTDIR not set)
17 endif 17 endif
18else 18else
19 OEDIR:=$(CONFIG_OE_BUILD_DIR) 19 OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g')
20 QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 20 QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/arm-linux/qt2
21 $(shell mkdir -p $(QTDIR)/src/moc) 21 $(shell mkdir -p $(QTDIR)/src/moc)
22 $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) 22 $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile)
23 PLATFORM=sharp-linux 23 PLATFORM=sharp-linux
24 OEHOSTSYS:=$(CONFIG_OE_HOST_SYS) 24 OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
25endif 25endif
26 26
27ifdef CONFIG_TARGET_X86 27ifdef CONFIG_TARGET_X86
28 PLATFORM=x86-linux 28 PLATFORM=x86-linux
29endif 29endif
30ifdef CONFIG_TARGET_SHARP 30ifdef CONFIG_TARGET_SHARP
31 PLATFORM=sharp-linux 31 PLATFORM=sharp-linux
32endif 32endif
33ifdef CONFIG_TARGET_IPAQ 33ifdef CONFIG_TARGET_IPAQ
34 PLATFORM=ipaq-linux 34 PLATFORM=ipaq-linux
35endif 35endif
36ifdef CONFIG_TARGET_RAMSES 36ifdef CONFIG_TARGET_RAMSES
37 PLATFORM=ramses-linux 37 PLATFORM=ramses-linux
38endif 38endif
39ifdef CONFIG_TARGET_SIMPAD 39ifdef CONFIG_TARGET_SIMPAD
40 PLATFORM=simpad-linux 40 PLATFORM=simpad-linux
41endif 41endif
42 42
43ifdef CONFIG_TARGET_YOPY 43ifdef CONFIG_TARGET_YOPY
44 PLATFORM=yopy-linux 44 PLATFORM=yopy-linux
45endif 45endif
46ifdef CONFIG_TARGET_MACOSX 46ifdef CONFIG_TARGET_MACOSX
47 PLATFORM=macx-darwin 47 PLATFORM=macx-darwin
48endif 48endif