equal
deleted
inserted
replaced
22 |
22 |
23 ifndef SKIP_GRE_REGISTRATION |
23 ifndef SKIP_GRE_REGISTRATION |
24 # to register xulrunner per-user, override this with $HOME/.gre.d |
24 # to register xulrunner per-user, override this with $HOME/.gre.d |
25 regdir = /etc/gre.d |
25 regdir = /etc/gre.d |
26 |
26 |
27 @@ -109,16 +112,17 @@ pkg_config_files += mozilla-nss.pc |
27 @@ -116,16 +119,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)|" \ |
38 -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ |
38 -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ |
39 -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ |
39 -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ |
40 -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ |
40 -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ |
41 -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ |
41 -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ |
42 -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ |
42 -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ |
43 -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@ |
43 -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \ |
44 chmod 644 $@ |
44 -e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \ |
45 diff --git a/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in |
45 diff --git a/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in |
46 --- a/xulrunner/installer/libxul-embedding.pc.in |
46 --- a/xulrunner/installer/libxul-embedding.pc.in |
47 +++ b/xulrunner/installer/libxul-embedding.pc.in |
47 +++ b/xulrunner/installer/libxul-embedding.pc.in |
48 @@ -1,10 +1,11 @@ |
48 @@ -1,10 +1,11 @@ |
49 prefix=%prefix% |
49 prefix=%prefix% |
70 |
70 |
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 -lxpcomglue_s -lxul -lxpcom |
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 |
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 |
77 --- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in |
78 +++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in |
78 +++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in |
79 @@ -1,8 +1,9 @@ |
79 @@ -1,8 +1,9 @@ |
80 prefix=%prefix% |
80 prefix=%prefix% |
110 |
110 |
111 Name: JavaScript |
111 Name: JavaScript |
112 Description: The Mozilla JavaScript Library |
112 Description: The Mozilla JavaScript Library |
113 Version: %MOZILLA_VERSION% |
113 Version: %MOZILLA_VERSION% |
114 Requires: %NSPR_NAME% >= %NSPR_VERSION% |
114 Requires: %NSPR_NAME% >= %NSPR_VERSION% |
115 -Libs: -L${sdkdir}/lib -lmozjs |
115 -Libs: -L${sdkdir}/lib %MOZ_JS_LINK% |
116 +Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib -lmozjs |
116 +Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib %MOZ_JS_LINK% |
117 Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE |
117 Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE |