1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent afc2e938b32548c127b2627045e0222b40d605a5 |
2 # Parent 1cd1e78dfe63c1a7bcfc0707697bb99bcfea19c4 |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
4 Install IDL files to includedir instead of /usr/share/idl |
4 Install IDL files to includedir instead of /usr/share/idl |
5 |
5 |
6 diff --git a/config/baseconfig.mk b/config/baseconfig.mk |
6 diff --git a/config/baseconfig.mk b/config/baseconfig.mk |
7 --- a/config/baseconfig.mk |
7 --- a/config/baseconfig.mk |
8 +++ b/config/baseconfig.mk |
8 +++ b/config/baseconfig.mk |
9 @@ -1,10 +1,10 @@ |
9 @@ -1,14 +1,14 @@ |
|
10 # This file is normally included by autoconf.mk, but it is also used |
|
11 # directly in python/mozbuild/mozbuild/base.py for gmake validation. |
|
12 # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending |
|
13 # whether a normal build is happening or whether the check is running. |
10 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
14 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
11 -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
15 -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
12 +idldir = $(includedir) |
16 +idldir = $(includedir) |
13 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
17 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
14 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) |
18 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) |
15 DIST = $(DEPTH)/dist |
19 ifndef TOP_DIST |
16 |
20 TOP_DIST = dist |
17 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't |
21 endif |
18 # manually use it before config.mk inclusion |
22 ifneq (,$(filter /%,$(TOP_DIST))) |
19 _OBJ_SUFFIX := $(OBJ_SUFFIX) |
23 DIST = $(TOP_DIST) |
20 OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX) |
24 else |