1 From: Wolfgang Rosenauer |
|
2 Subject: pkgconfig tuning |
|
3 |
|
4 diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in |
|
5 --- a/xulrunner/installer/Makefile.in |
|
6 +++ b/xulrunner/installer/Makefile.in |
|
7 @@ -33,16 +33,19 @@ include $(topsrcdir)/config/rules.mk |
|
8 |
|
9 INSTALL_SDK = 1 |
|
10 |
|
11 include $(topsrcdir)/toolkit/mozapps/installer/signing.mk |
|
12 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
|
13 |
|
14 # Add pkg-config files to the install:: target |
|
15 |
|
16 +# the apilibdir always ends with 1.9 as every patch update will provide a link |
|
17 +apilibdir = $(dir $(installdir))xulrunner-18 |
|
18 + |
|
19 pkg_config_files = \ |
|
20 libxul.pc \ |
|
21 libxul-embedding.pc \ |
|
22 mozilla-js.pc \ |
|
23 mozilla-plugin.pc \ |
|
24 $(NULL) |
|
25 |
|
26 ifdef MOZ_NATIVE_NSPR |
|
27 @@ -70,16 +73,17 @@ pkg_config_files += mozilla-nss.pc |
|
28 endif |
|
29 |
|
30 %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) |
|
31 cat $< | sed \ |
|
32 -e "s|%prefix%|$(prefix)|" \ |
|
33 -e "s|%includedir%|$(includedir)|" \ |
|
34 -e "s|%idldir%|$(idldir)|" \ |
|
35 -e "s|%sdkdir%|$(sdkdir)|" \ |
|
36 + -e "s|%libdir%|$(apilibdir)|" \ |
|
37 -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ |
|
38 -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ |
|
39 -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ |
|
40 -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ |
|
41 -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ |
|
42 -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ |
|
43 -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \ |
|
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 |
|
46 --- a/xulrunner/installer/libxul-embedding.pc.in |
|
47 +++ b/xulrunner/installer/libxul-embedding.pc.in |
|
48 @@ -1,10 +1,11 @@ |
|
49 prefix=%prefix% |
|
50 sdkdir=%sdkdir% |
|
51 includedir=%includedir% |
|
52 idldir=%idldir% |
|
53 |
|
54 Name: libxul-embedding |
|
55 Description: Static library for version-independent embedding of the Mozilla runtime |
|
56 Version: %MOZILLA_VERSION% |
|
57 -Libs: -L${sdkdir}/lib -lxpcomglue -ldl |
|
58 +Requires: %NSPR_NAME% >= %NSPR_VERSION% |
|
59 +Libs: -L${sdkdir}/sdk/lib -lxpcomglue -ldl |
|
60 Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% |
|
61 diff --git a/xulrunner/installer/libxul.pc.in b/xulrunner/installer/libxul.pc.in |
|
62 --- a/xulrunner/installer/libxul.pc.in |
|
63 +++ b/xulrunner/installer/libxul.pc.in |
|
64 @@ -1,10 +1,11 @@ |
|
65 prefix=%prefix% |
|
66 sdkdir=%sdkdir% |
|
67 +libdir=%libdir% |
|
68 includedir=%includedir% |
|
69 idldir=%idldir% |
|
70 |
|
71 Name: libxul |
|
72 Description: The Mozilla Runtime and Embedding Engine |
|
73 Version: %MOZILLA_VERSION% |
|
74 Requires: %NSPR_NAME% >= %NSPR_VERSION% |
|
75 Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% |
|
76 diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in |
|
77 --- a/xulrunner/installer/mozilla-js.pc.in |
|
78 +++ b/xulrunner/installer/mozilla-js.pc.in |
|
79 @@ -1,10 +1,11 @@ |
|
80 prefix=%prefix% |
|
81 sdkdir=%sdkdir% |
|
82 +libdir=%libdir% |
|
83 includedir=%includedir% |
|
84 |
|
85 Name: JavaScript |
|
86 Description: The Mozilla JavaScript Library |
|
87 Version: %MOZILLA_VERSION% |
|
88 Requires: %NSPR_NAME% >= %NSPR_VERSION% |
|
89 -Libs: -L${sdkdir}/lib %MOZ_JS_LINK% |
|
90 +Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib %MOZ_JS_LINK% |
|
91 Cflags: -I${includedir} -DXP_UNIX |
|