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 @@ -31,16 +31,19 @@ include $(topsrcdir)/config/rules.mk |
7 @@ -32,16 +32,19 @@ include $(topsrcdir)/config/rules.mk |
8 |
8 |
9 INSTALL_SDK = 1 |
9 INSTALL_SDK = 1 |
10 |
10 |
11 include $(topsrcdir)/toolkit/mozapps/installer/signing.mk |
11 include $(topsrcdir)/toolkit/mozapps/installer/signing.mk |
12 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
12 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
13 |
13 |
14 # Add pkg-config files to the install:: target |
14 # Add pkg-config files to the install:: target |
15 |
15 |
16 +# the apilibdir always ends with 1.9 as every patch update will provide a link |
16 +# the apilibdir always ends with 1.9 as every patch update will provide a link |
17 +apilibdir = $(dir $(installdir))xulrunner-18 |
17 +apilibdir = $(dir $(installdir))xulrunner-31 |
18 + |
18 + |
19 pkg_config_files = \ |
19 pkg_config_files = \ |
20 libxul.pc \ |
20 libxul.pc \ |
21 libxul-embedding.pc \ |
21 libxul-embedding.pc \ |
22 mozilla-js.pc \ |
22 mozilla-js.pc \ |
23 mozilla-plugin.pc \ |
23 mozilla-plugin.pc \ |
24 $(NULL) |
24 $(NULL) |
25 |
25 |
26 ifdef MOZ_NATIVE_NSPR |
26 ifdef MOZ_NATIVE_NSPR |
27 @@ -68,16 +71,17 @@ pkg_config_files += mozilla-nss.pc |
27 @@ -69,16 +72,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)|" \ |