diff -r e1c226a4de34 -r cef565f1c325 mozilla-idldir.patch --- a/mozilla-idldir.patch Sun Apr 13 16:54:09 2014 +0200 +++ b/mozilla-idldir.patch Mon Apr 14 09:09:11 2014 +0200 @@ -1,20 +1,24 @@ # HG changeset patch -# Parent afc2e938b32548c127b2627045e0222b40d605a5 +# Parent 1cd1e78dfe63c1a7bcfc0707697bb99bcfea19c4 # User Wolfgang Rosenauer Install IDL files to includedir instead of /usr/share/idl diff --git a/config/baseconfig.mk b/config/baseconfig.mk --- a/config/baseconfig.mk +++ b/config/baseconfig.mk -@@ -1,10 +1,10 @@ +@@ -1,14 +1,14 @@ + # This file is normally included by autoconf.mk, but it is also used + # directly in python/mozbuild/mozbuild/base.py for gmake validation. + # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending + # whether a normal build is happening or whether the check is running. includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +idldir = $(includedir) installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - DIST = $(DEPTH)/dist - - # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't - # manually use it before config.mk inclusion - _OBJ_SUFFIX := $(OBJ_SUFFIX) - OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX) + ifndef TOP_DIST + TOP_DIST = dist + endif + ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) + else