Followup to bug 488175 - fix additional pkgconfig files to remove references to the -unstable packages as well as the stable/ and unstable/ include directories, r=bsmedberg
authorMatsuura Takanori <t.matsuu@gmail.com>
Fri, 22 May 2009 11:38:37 -0400
changeset 28723 8b297d7065d89825b19457f2e92ec774b10c392c
parent 28722 7bbdbdfda2b46c8cfea4696f35729ea078241cc2
child 28724 0b821db9a67e5bdc4b79d938bbef8ca3141bf533
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs488175
milestone1.9.2a1pre
Followup to bug 488175 - fix additional pkgconfig files to remove references to the -unstable packages as well as the stable/ and unstable/ include directories, r=bsmedberg
xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
xulrunner/installer/mozilla-gtkmozembed.pc.in
xulrunner/installer/mozilla-js.pc.in
xulrunner/installer/mozilla-nss.pc.in
xulrunner/installer/mozilla-plugin.pc.in
--- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
@@ -1,8 +1,8 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 
 Name: mozilla-gtkembedmoz
 Description: Static version-independent Mozilla Embedding Widget for Gtk+
 Version: %MOZILLA_VERSION%
-Requires: libxul-embedding-unstable = %MOZILLA_VERSION%
+Requires: libxul-embedding = %MOZILLA_VERSION%
--- a/xulrunner/installer/mozilla-gtkmozembed.pc.in
+++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in
@@ -1,8 +1,8 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 
 Name: mozilla-gtkembedmoz
 Description: Mozilla Embedding Widget for Gtk+
 Version: %MOZILLA_VERSION%
-Requires: libxul-unstable = %MOZILLA_VERSION%
+Requires: libxul = %MOZILLA_VERSION%
--- a/xulrunner/installer/mozilla-js.pc.in
+++ b/xulrunner/installer/mozilla-js.pc.in
@@ -2,9 +2,9 @@ prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 
 Name: JavaScript
 Description: The Mozilla JavaScript Library
 Version: %MOZILLA_VERSION%
 Requires: %NSPR_NAME% >= %NSPR_VERSION%
 Libs: -L${sdkdir}/lib -lmozjs
-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
+Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
--- a/xulrunner/installer/mozilla-nss.pc.in
+++ b/xulrunner/installer/mozilla-nss.pc.in
@@ -2,9 +2,9 @@ prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 
 Name: NSS
 Description: Mozilla Network Security Services
 Version: %MOZILLA_VERSION%
 Requires: %NSPR_NAME% >= %NSPR_VERSION%
 Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3
-Cflags: -I${includedir}/stable
+Cflags: -I${includedir}
--- a/xulrunner/installer/mozilla-plugin.pc.in
+++ b/xulrunner/installer/mozilla-plugin.pc.in
@@ -1,8 +1,8 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 
 Name: Mozilla Plug-In API
 Description: Mozilla Plug-In API
 Version: %MOZILLA_VERSION%
-Cflags: -I${includedir}/stable -DXP_UNIX
+Cflags: -I${includedir} -DXP_UNIX