|
1
|
1 |
diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
|
|
|
2 |
--- a/xulrunner/installer/Makefile.in
|
|
|
3 |
+++ b/xulrunner/installer/Makefile.in
|
|
|
4 |
@@ -62,16 +62,19 @@ PKG_DMG_SOURCE = $(STAGEPATH)xulrunner-p
|
|
|
5 |
endif
|
|
|
6 |
|
|
|
7 |
include $(topsrcdir)/config/rules.mk
|
|
|
8 |
|
|
|
9 |
INSTALL_SDK = 1
|
|
|
10 |
|
|
|
11 |
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
|
|
|
12 |
|
|
|
13 |
+# the apilibdir always ends with 1.9 as every patch update will provide a link
|
|
|
14 |
+apilibdir = $(dir $(installdir))xulrunner-1.9.2
|
|
|
15 |
+
|
|
|
16 |
$(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile
|
|
|
17 |
printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
|
|
|
18 |
$(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
|
|
|
19 |
|
|
|
20 |
ifndef SKIP_GRE_REGISTRATION
|
|
|
21 |
# to register xulrunner per-user, override this with $HOME/.gre.d
|
|
|
22 |
regdir = /etc/gre.d
|
|
|
23 |
|
|
|
24 |
@@ -116,16 +119,17 @@ endif
|
|
|
25 |
|
|
|
26 |
%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
|
|
|
27 |
cat $< | sed \
|
|
|
28 |
-e "s|%ojidef%|$(OJIDEF)|" \
|
|
|
29 |
-e "s|%prefix%|$(prefix)|" \
|
|
|
30 |
-e "s|%includedir%|$(includedir)|" \
|
|
|
31 |
-e "s|%idldir%|$(idldir)|" \
|
|
|
32 |
-e "s|%sdkdir%|$(sdkdir)|" \
|
|
|
33 |
+ -e "s|%libdir%|$(apilibdir)|" \
|
|
|
34 |
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
|
|
|
35 |
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
|
|
|
36 |
-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
|
|
|
37 |
-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
|
|
|
38 |
-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
|
|
|
39 |
-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
|
|
|
40 |
-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
|
|
|
41 |
chmod 644 $@
|
|
|
42 |
diff --git a/xulrunner/installer/libxul-embedding.pc.in b/xulrunner/installer/libxul-embedding.pc.in
|
|
|
43 |
--- a/xulrunner/installer/libxul-embedding.pc.in
|
|
|
44 |
+++ b/xulrunner/installer/libxul-embedding.pc.in
|
|
|
45 |
@@ -1,10 +1,11 @@
|
|
|
46 |
prefix=%prefix%
|
|
|
47 |
sdkdir=%sdkdir%
|
|
|
48 |
includedir=%includedir%
|
|
|
49 |
idldir=%idldir%
|
|
|
50 |
|
|
|
51 |
Name: libxul-embedding
|
|
|
52 |
Description: Static library for version-independent embedding of the Mozilla runtime
|
|
|
53 |
Version: %MOZILLA_VERSION%
|
|
|
54 |
-Libs: -L${sdkdir}/lib -lxpcomglue
|
|
|
55 |
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
|
|
|
56 |
+Libs: -L${sdkdir}/sdk/lib -lxpcomglue
|
|
|
57 |
Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
|
|
|
58 |
diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
|
|
|
59 |
--- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
|
|
|
60 |
+++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
|
|
|
61 |
@@ -1,8 +1,9 @@
|
|
|
62 |
prefix=%prefix%
|
|
|
63 |
sdkdir=%sdkdir%
|
|
|
64 |
+libdir=%libdir%
|
|
|
65 |
includedir=%includedir%
|
|
|
66 |
|
|
|
67 |
Name: mozilla-gtkembedmoz
|
|
|
68 |
Description: Static version-independent Mozilla Embedding Widget for Gtk+
|
|
|
69 |
Version: %MOZILLA_VERSION%
|
|
|
70 |
Requires: libxul-embedding = %MOZILLA_VERSION%
|
|
|
71 |
diff --git a/xulrunner/installer/mozilla-gtkmozembed.pc.in b/xulrunner/installer/mozilla-gtkmozembed.pc.in
|
|
|
72 |
--- a/xulrunner/installer/mozilla-gtkmozembed.pc.in
|
|
|
73 |
+++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in
|
|
|
74 |
@@ -1,8 +1,9 @@
|
|
|
75 |
prefix=%prefix%
|
|
|
76 |
sdkdir=%sdkdir%
|
|
|
77 |
+libdir=%libdir%
|
|
|
78 |
includedir=%includedir%
|
|
|
79 |
|
|
|
80 |
Name: mozilla-gtkembedmoz
|
|
|
81 |
Description: Mozilla Embedding Widget for Gtk+
|
|
|
82 |
Version: %MOZILLA_VERSION%
|
|
|
83 |
Requires: libxul = %MOZILLA_VERSION%
|
|
|
84 |
diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in
|
|
|
85 |
--- a/xulrunner/installer/mozilla-js.pc.in
|
|
|
86 |
+++ b/xulrunner/installer/mozilla-js.pc.in
|
|
|
87 |
@@ -1,10 +1,11 @@
|
|
|
88 |
prefix=%prefix%
|
|
|
89 |
sdkdir=%sdkdir%
|
|
|
90 |
+libdir=%libdir%
|
|
|
91 |
includedir=%includedir%
|
|
|
92 |
|
|
|
93 |
Name: JavaScript
|
|
|
94 |
Description: The Mozilla JavaScript Library
|
|
|
95 |
Version: %MOZILLA_VERSION%
|
|
|
96 |
Requires: %NSPR_NAME% >= %NSPR_VERSION%
|
|
|
97 |
-Libs: -L${sdkdir}/lib -lmozjs
|
|
|
98 |
+Libs: -Wl,-rpath,${libdir} -L${sdkdir}/lib -lmozjs
|
|
|
99 |
Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
|