mozilla-idldir.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Tue, 09 Oct 2012 13:40:39 +0200
branchfirefox16
changeset 555 a8c0d77272f6
child 686 ab25aac2aa83
permissions -rw-r--r--
fix idl dir again remove unneeded patch from xulrunner package
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
555
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# Parent 2b6d21723804b8b5a73a2fe675ee9ce25f788229
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# User Wolfgang Rosenauer <wr@rosenauer.org>
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
Install IDL files to includedir instead of /usr/share/idl
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
diff --git a/config/baseconfig.mk b/config/baseconfig.mk
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
--- a/config/baseconfig.mk
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+++ b/config/baseconfig.mk
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
@@ -1,12 +1,12 @@
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
 INCLUDED_AUTOCONF_MK = 1
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
 
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
+idldir = $(includedir)
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
 DIST = $(DEPTH)/dist
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
 
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
 # manually use it before config.mk inclusion
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
 _OBJ_SUFFIX := $(OBJ_SUFFIX)
a8c0d77272f6 fix idl dir again
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)