summaryrefslogtreecommitdiff
path: root/Vars.make
authorar <ar>2005-01-24 22:41:03 (UTC)
committer ar <ar>2005-01-24 22:41:03 (UTC)
commitd3ca4c7807c7a22837e481c1016c9814a68e00fb (patch) (side-by-side diff)
tree9c650cbd159bcec44d10e0b6023c6447a12a7678 /Vars.make
parent3d4c2eb3932f024bd046e8c4ac747d147a823d63 (diff)
downloadopie-d3ca4c7807c7a22837e481c1016c9814a68e00fb.zip
opie-d3ca4c7807c7a22837e481c1016c9814a68e00fb.tar.gz
opie-d3ca4c7807c7a22837e481c1016c9814a68e00fb.tar.bz2
- clear OEDIR & co from " for crosscompile opie against OpenEmbedded stage
Diffstat (limited to 'Vars.make') (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,72 +1,72 @@
prefix=/opt/QtPalmtop
ifeq ($(OPIEDIR),)
export OPIEDIR:=$(TOPDIR)
endif
ifeq ($(IPK_DIR),)
export IPK_DIR:=$(OPIEDIR)
endif
ifneq ($(wildcard $(TOPDIR)/.config),)
include $(TOPDIR)/.config
endif
ifndef CONFIG_TARGET_OE
ifndef QTDIR
$(error QTDIR not set)
endif
else
- OEDIR:=$(CONFIG_OE_BUILD_DIR)
- QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2
+ OEDIR:=$(shell echo $(CONFIG_OE_BUILD_DIR) | sed -e's/"//g')
+ QTDIR:=$(shell echo $(OEDIR) | sed -e's/"//g')/tmp/staging/arm-linux/qt2
$(shell mkdir -p $(QTDIR)/src/moc)
$(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile)
PLATFORM=sharp-linux
- OEHOSTSYS:=$(CONFIG_OE_HOST_SYS)
+ OEHOSTSYS:=$(shell echo $(CONFIG_OE_HOST_SYS) | sed -e's/"//g')
endif
ifdef CONFIG_TARGET_X86
PLATFORM=x86-linux
endif
ifdef CONFIG_TARGET_SHARP
PLATFORM=sharp-linux
endif
ifdef CONFIG_TARGET_IPAQ
PLATFORM=ipaq-linux
endif
ifdef CONFIG_TARGET_RAMSES
PLATFORM=ramses-linux
endif
ifdef CONFIG_TARGET_SIMPAD
PLATFORM=simpad-linux
endif
ifdef CONFIG_TARGET_YOPY
PLATFORM=yopy-linux
endif
ifdef CONFIG_TARGET_MACOSX
PLATFORM=macx-darwin
endif
export QMAKE:=$(OPIEDIR)/qmake/qmake
export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
ifeq ($(QPE_VERSION),)
VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h))
QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
ifeq ($(QPE_VERSION),..)
QPE_VERSION=1.1.2
endif
endif
export QPE_VERSION
SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
ifeq ($(VERSION_CVS),)
VERSION_CVS:=$(shell date +%s)
endif
ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
SUB_VERSION:=$(VERSION_CVS)
endif
export SUB_VERSION