2 Subject: pkgconfig tuning |
2 Subject: pkgconfig tuning |
3 |
3 |
4 diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in |
4 diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in |
5 --- a/xulrunner/installer/Makefile.in |
5 --- a/xulrunner/installer/Makefile.in |
6 +++ b/xulrunner/installer/Makefile.in |
6 +++ b/xulrunner/installer/Makefile.in |
7 @@ -62,16 +62,19 @@ PKG_DMG_SOURCE = $(STAGEPATH)xulrunner-p |
7 @@ -66,16 +66,19 @@ include $(topsrcdir)/config/rules.mk |
8 endif |
|
9 |
|
10 include $(topsrcdir)/config/rules.mk |
|
11 |
8 |
12 INSTALL_SDK = 1 |
9 INSTALL_SDK = 1 |
|
10 GENERATE_CACHE = 1 |
13 |
11 |
14 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
12 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
15 |
13 |
16 +# the apilibdir always ends with 1.9 as every patch update will provide a link |
|
17 +apilibdir = $(dir $(installdir))xulrunner-2.2 |
|
18 + |
|
19 # Add pkg-config files to the install:: target |
14 # Add pkg-config files to the install:: target |
20 |
15 |
|
16 +# the apilibdir always ends with 1.9 as every patch update will provide a link |
|
17 +apilibdir = $(dir $(installdir))xulrunner-8 |
|
18 + |
21 pkg_config_files = \ |
19 pkg_config_files = \ |
22 libxul.pc \ |
20 libxul.pc \ |
23 libxul-embedding.pc \ |
21 libxul-embedding.pc \ |
24 mozilla-js.pc \ |
22 mozilla-js.pc \ |
25 mozilla-plugin.pc \ |
23 mozilla-plugin.pc \ |
26 mozilla-gtkmozembed.pc \ |
24 mozilla-gtkmozembed.pc \ |
27 @@ -103,16 +106,17 @@ pkg_config_files += mozilla-nss.pc |
25 mozilla-gtkmozembed-embedding.pc \ |
|
26 $(NULL) |
|
27 @@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc |
28 endif |
28 endif |
29 |
29 |
30 %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) |
30 %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) |
31 cat $< | sed \ |
31 cat $< | sed \ |
32 -e "s|%prefix%|$(prefix)|" \ |
32 -e "s|%prefix%|$(prefix)|" \ |