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 @@ -116,16 +119,17 @@ endif |
27 @@ -109,16 +112,17 @@ pkg_config_files += mozilla-nss.pc |
|
28 endif |
28 |
29 |
29 %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) |
30 %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) |
30 cat $< | sed \ |
31 cat $< | sed \ |
31 -e "s|%ojidef%|$(OJIDEF)|" \ |
|
32 -e "s|%prefix%|$(prefix)|" \ |
32 -e "s|%prefix%|$(prefix)|" \ |
33 -e "s|%includedir%|$(includedir)|" \ |
33 -e "s|%includedir%|$(includedir)|" \ |
34 -e "s|%idldir%|$(idldir)|" \ |
34 -e "s|%idldir%|$(idldir)|" \ |
35 -e "s|%sdkdir%|$(sdkdir)|" \ |
35 -e "s|%sdkdir%|$(sdkdir)|" \ |
36 + -e "s|%libdir%|$(apilibdir)|" \ |
36 + -e "s|%libdir%|$(apilibdir)|" \ |
52 idldir=%idldir% |
52 idldir=%idldir% |
53 |
53 |
54 Name: libxul-embedding |
54 Name: libxul-embedding |
55 Description: Static library for version-independent embedding of the Mozilla runtime |
55 Description: Static library for version-independent embedding of the Mozilla runtime |
56 Version: %MOZILLA_VERSION% |
56 Version: %MOZILLA_VERSION% |
57 -Libs: -L${sdkdir}/lib -lxpcomglue |
57 -Libs: -L${sdkdir}/lib -lxpcomglue -ldl |
58 +Requires: %NSPR_NAME% >= %NSPR_VERSION% |
58 +Requires: %NSPR_NAME% >= %NSPR_VERSION% |
59 +Libs: -L${sdkdir}/sdk/lib -lxpcomglue |
59 +Libs: -L${sdkdir}/sdk/lib -lxpcomglue -ldl |
60 Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% |
60 Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% |
61 diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in |
61 diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in |
62 --- a/xulrunner/installer/libxul.pc.in |
62 --- a/xulrunner/installer/libxul.pc.in |
63 +++ b/xulrunner/installer/libxul.pc.in |
63 +++ b/xulrunner/installer/libxul.pc.in |
64 @@ -1,10 +1,11 @@ |
64 @@ -1,10 +1,11 @@ |
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 -lmozjs |
116 +Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib -lmozjs |
116 +Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib -lmozjs |
117 Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE |
117 Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE |
118 diff --git a/xulrunner/installer/mozilla-plugin.pc.in b/xulrunner/installer/mozilla-plugin.pc.in |
|
119 --- a/xulrunner/installer/mozilla-plugin.pc.in |
|
120 +++ b/xulrunner/installer/mozilla-plugin.pc.in |
|
121 @@ -1,9 +1,9 @@ |
|
122 prefix=%prefix% |
|
123 sdkdir=%sdkdir% |
|
124 includedir=%includedir% |
|
125 |
|
126 Name: Mozilla Plug-In API |
|
127 Description: Mozilla Plug-In API |
|
128 Version: %MOZILLA_VERSION% |
|
129 -Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% |
|
130 +Cflags: -I${includedir} -DXP_UNIX %ojidef% |
|
131 |
|