| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Sun, 29 Dec 2013 22:45:13 +0100 | |
| changeset 691 | 18c2dc922e51 |
| parent 686 | ab25aac2aa83 |
| child 716 | cef565f1c325 |
| permissions | -rw-r--r-- |
|
556
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
|
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
556
diff
changeset
|
2 |
# Parent afc2e938b32548c127b2627045e0222b40d605a5 |
|
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 |
|
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
556
diff
changeset
|
9 |
@@ -1,10 +1,10 @@ |
|
556
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
+idldir = $(includedir) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
DIST = $(DEPTH)/dist |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
|
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
# manually use it before config.mk inclusion |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
_OBJ_SUFFIX := $(OBJ_SUFFIX) |
|
a30fcfcd2e53
manual merge from firefox16 changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX) |