author | ar <ar> | 2004-10-17 10:40:42 (UTC) |
---|---|---|
committer | ar <ar> | 2004-10-17 10:40:42 (UTC) |
commit | 054918af08eb6041e3e5400c2024bc39e472fd8d (patch) (side-by-side diff) | |
tree | 59018da78313bef031f14f09c46ce8784800884e | |
parent | 1deb4b9d09fcb0eddd8425de7d66e8919e1e0d32 (diff) | |
download | opie-054918af08eb6041e3e5400c2024bc39e472fd8d.zip opie-054918af08eb6041e3e5400c2024bc39e472fd8d.tar.gz opie-054918af08eb6041e3e5400c2024bc39e472fd8d.tar.bz2 |
- only set CCACHE_PREFIX when distcc is installed.
remove buildrpoblems on machines without distcc (file not found on make)
-rw-r--r-- | Vars.make | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -61,66 +61,67 @@ ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VER SUB_VERSION:=$(VERSION_CVS) endif export SUB_VERSION ifneq ($(strip $(SUB_VERSION)),) EXTRAVERSION=-$(SUB_VERSION) endif ifeq ($(QTE_REVISION),) QTE_REVISION=6 endif export QTE_REVISION export DEB_VERSION=2.0 ifeq ($(QTE_BASEVERSION),) ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') else QTE_BASEVERSION=2.3.7 endif endif export QTE_BASEVERSION ifeq ($(QTE_VERSION),) ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') else QTE_VERSION=2.3.7 endif endif export QTE_VERSION export PATH:=$(OPIEDIR)/scripts:$(PATH) export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) ifdef CONFIG_OPTIMIZATIONS export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) endif ifeq ($(STRIP),) ifneq ($(CONFIG_TARGET_X86),) STRIP=strip endif ifneq ($(CONFIG_TARGET_IPAQ),) STRIP=arm-linux-strip endif ifneq ($(CONFIG_TARGET_SHARP),) STRIP=arm-linux-strip endif ifneq ($(CONFIG_TARGET_RAMSES),) STRIP=arm-linux-strip endif ifneq ($(CONFIG_TARGET_SIMPAD),) STRIP=arm-linux-strip endif ifneq ($(CONFIG_TARGET_YOPY),) STRIP=arm-linux-strip endif endif export CCACHE=$(shell which ccache 2>/dev/null) export DISTCC=$(shell which distcc 2>/dev/null) +ifneq ($(DISTCC),) export CCACHE_PREFIX=$(shell which distcc &>/dev/null && echo distcc) - +endif |