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 164 995e803e8198
parent 77 f2df98836e17
child 189 1b299e08ac05 
--- a/mozilla-pkgconfig.patch	Wed Sep 29 14:11:58 2010 +0200
+++ b/mozilla-pkgconfig.patch	Wed Sep 29 21:05:58 2010 +0200
@@ -24,7 +24,7 @@
  # to register xulrunner per-user, override this with $HOME/.gre.d
  regdir = /etc/gre.d
  
-@@ -109,16 +112,17 @@ pkg_config_files += mozilla-nss.pc
+@@ -116,16 +119,17 @@ pkg_config_files += mozilla-nss.pc
  endif
  
  %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
@@ -40,8 +40,8 @@
  	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
  	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
  	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
- 	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
- 	chmod 644 $@
+ 	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \
+ 	-e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \
 diff --git a/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in
 --- a/xulrunner/installer/libxul-embedding.pc.in
 +++ b/xulrunner/installer/libxul-embedding.pc.in
@@ -72,7 +72,7 @@
  Description: The Mozilla Runtime and Embedding Engine
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
+ 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
@@ -112,6 +112,6 @@
  Description: The Mozilla JavaScript Library
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Libs: -L${sdkdir}/lib -lmozjs
-+Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib -lmozjs
+-Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
++Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib %MOZ_JS_LINK%
  Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
mozilla