equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 1cd1e78dfe63c1a7bcfc0707697bb99bcfea19c4 |
2 # Parent 1cd1e78dfe63c1a7bcfc0707697bb99bcfea19c4 |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
4 # Parent 015730e17931512895a5ad4d5130eff4258cf03e |
4 # Parent b0fb5e009b6af361b8781a923daa65170a2fdedb |
5 Install IDL files to includedir instead of /usr/share/idl |
5 Install IDL files to includedir instead of /usr/share/idl |
6 |
6 |
7 diff --git a/config/baseconfig.mk b/config/baseconfig.mk |
7 diff --git a/config/baseconfig.mk b/config/baseconfig.mk |
8 --- a/config/baseconfig.mk |
8 --- a/config/baseconfig.mk |
9 +++ b/config/baseconfig.mk |
9 +++ b/config/baseconfig.mk |
15 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
15 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
16 -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
16 -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
17 +idldir = $(includedir) |
17 +idldir = $(includedir) |
18 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
18 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
19 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) |
19 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) |
20 ifndef TOP_DIST |
20 ifeq (.,$(DEPTH)) |
21 TOP_DIST = dist |
21 DIST = dist |
|
22 else |
|
23 DIST = $(DEPTH)/dist |
22 endif |
24 endif |
23 ifneq (,$(filter /%,$(TOP_DIST))) |
25 ABS_DIST = $(topobjdir)/dist |
24 DIST = $(TOP_DIST) |
|
25 else |
|