| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Fri, 07 Aug 2015 09:39:31 +0200 | |
| branch | firefox39 |
| changeset 870 | 09ffe9247f8a |
| parent 716 | cef565f1c325 |
| child 869 | 0dd25a92df97 |
| permissions | -rw-r--r-- |
|
556
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
2 |
# Parent 1cd1e78dfe63c1a7bcfc0707697bb99bcfea19c4 |
|
556
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
Install IDL files to includedir instead of /usr/share/idl |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
|
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
diff --git a/config/baseconfig.mk b/config/baseconfig.mk |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
--- a/config/baseconfig.mk |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
+++ b/config/baseconfig.mk |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
9 |
@@ -1,14 +1,14 @@ |
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
10 |
# This file is normally included by autoconf.mk, but it is also used |
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
11 |
# directly in python/mozbuild/mozbuild/base.py for gmake validation. |
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
12 |
# We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending |
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
13 |
# whether a normal build is happening or whether the check is running. |
|
556
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
+idldir = $(includedir) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
19 |
ifndef TOP_DIST |
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
20 |
TOP_DIST = dist |
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
21 |
endif |
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
22 |
ifneq (,$(filter /%,$(TOP_DIST))) |
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
23 |
DIST = $(TOP_DIST) |
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
24 |
else |