Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-pkgconfig.patch
changeset 410 0af1b0003b9f
parent 382 67f876aafae8
child 440 8e36d7509c1b
child 443 12f422228367 
--- a/mozilla-pkgconfig.patch	Thu Mar 15 10:33:22 2012 +0100
+++ b/mozilla-pkgconfig.patch	Fri Mar 16 07:48:35 2012 +0100
@@ -4,17 +4,17 @@
 diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
 --- a/xulrunner/installer/Makefile.in
 +++ b/xulrunner/installer/Makefile.in
-@@ -68,16 +68,19 @@ INSTALL_SDK = 1
- ifndef MOZ_PLATFORM_MAEMO
+@@ -69,16 +69,19 @@ ifndef MOZ_PLATFORM_MAEMO
  GENERATE_CACHE = 1
  endif
  
+ include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
  include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
  
  # 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-11
++apilibdir = $(dir $(installdir))xulrunner-12
 +
  pkg_config_files = \
  	libxul.pc \
@@ -24,7 +24,7 @@
  	$(NULL)
  
  ifdef MOZ_NATIVE_NSPR
-@@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc
+@@ -106,16 +109,17 @@ pkg_config_files += mozilla-nss.pc
  endif
  
  %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
mozilla