--- a/mozilla-pkgconfig.patch Sat Nov 12 16:22:36 2011 +0100
+++ b/mozilla-pkgconfig.patch Fri Nov 18 07:36:46 2011 +0100
@@ -14,17 +14,17 @@
# Add pkg-config files to the install:: target
+# the apilibdir always ends with 1.9 as every patch update will provide a link
-+apilibdir = $(dir $(installdir))xulrunner-8
++apilibdir = $(dir $(installdir))xulrunner-9
+
pkg_config_files = \
libxul.pc \
libxul-embedding.pc \
mozilla-js.pc \
mozilla-plugin.pc \
- mozilla-gtkmozembed.pc \
- mozilla-gtkmozembed-embedding.pc \
$(NULL)
-@@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc
+
+ ifdef MOZ_NATIVE_NSPR
+@@ -103,16 +106,17 @@ pkg_config_files += mozilla-nss.pc
endif
%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
@@ -73,32 +73,6 @@
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib %MOZ_XUL_LINK%
-diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
-+++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
-@@ -1,8 +1,9 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
-
- Name: mozilla-gtkembedmoz
- Description: Static version-independent Mozilla Embedding Widget for Gtk+
- Version: %MOZILLA_VERSION%
- Requires: libxul-embedding = %MOZILLA_VERSION%
-diff --git a/xulrunner/installer/mozilla-gtkmozembed.pc.in b/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- a/xulrunner/installer/mozilla-gtkmozembed.pc.in
-+++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in
-@@ -1,8 +1,9 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
-
- Name: mozilla-gtkembedmoz
- Description: Mozilla Embedding Widget for Gtk+
- Version: %MOZILLA_VERSION%
- Requires: libxul = %MOZILLA_VERSION%
diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in
--- a/xulrunner/installer/mozilla-js.pc.in
+++ b/xulrunner/installer/mozilla-js.pc.in