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-8 |
17 +apilibdir = $(dir $(installdir))xulrunner-9 |
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 mozilla-gtkmozembed.pc \ |
|
25 mozilla-gtkmozembed-embedding.pc \ |
|
26 $(NULL) |
24 $(NULL) |
27 @@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc |
25 |
|
26 ifdef MOZ_NATIVE_NSPR |
|
27 @@ -103,16 +106,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)|" \ |
71 Name: libxul |
71 Name: libxul |
72 Description: The Mozilla Runtime and Embedding Engine |
72 Description: The Mozilla Runtime and Embedding Engine |
73 Version: %MOZILLA_VERSION% |
73 Version: %MOZILLA_VERSION% |
74 Requires: %NSPR_NAME% >= %NSPR_VERSION% |
74 Requires: %NSPR_NAME% >= %NSPR_VERSION% |
75 Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% |
75 Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% |
76 diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in |
|
77 --- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in |
|
78 +++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in |
|
79 @@ -1,8 +1,9 @@ |
|
80 prefix=%prefix% |
|
81 sdkdir=%sdkdir% |
|
82 +libdir=%libdir% |
|
83 includedir=%includedir% |
|
84 |
|
85 Name: mozilla-gtkembedmoz |
|
86 Description: Static version-independent Mozilla Embedding Widget for Gtk+ |
|
87 Version: %MOZILLA_VERSION% |
|
88 Requires: libxul-embedding = %MOZILLA_VERSION% |
|
89 diff --git a/xulrunner/installer/mozilla-gtkmozembed.pc.in b/xulrunner/installer/mozilla-gtkmozembed.pc.in |
|
90 --- a/xulrunner/installer/mozilla-gtkmozembed.pc.in |
|
91 +++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in |
|
92 @@ -1,8 +1,9 @@ |
|
93 prefix=%prefix% |
|
94 sdkdir=%sdkdir% |
|
95 +libdir=%libdir% |
|
96 includedir=%includedir% |
|
97 |
|
98 Name: mozilla-gtkembedmoz |
|
99 Description: Mozilla Embedding Widget for Gtk+ |
|
100 Version: %MOZILLA_VERSION% |
|
101 Requires: libxul = %MOZILLA_VERSION% |
|
102 diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in |
76 diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in |
103 --- a/xulrunner/installer/mozilla-js.pc.in |
77 --- a/xulrunner/installer/mozilla-js.pc.in |
104 +++ b/xulrunner/installer/mozilla-js.pc.in |
78 +++ b/xulrunner/installer/mozilla-js.pc.in |
105 @@ -1,10 +1,11 @@ |
79 @@ -1,10 +1,11 @@ |
106 prefix=%prefix% |
80 prefix=%prefix% |