]>
Commit | Line | Data |
---|---|---|
1 | --- firefox-47.0/browser/installer/Makefile.in.orig 2016-06-01 06:11:40.000000000 +0200 | |
2 | +++ firefox-47.0/browser/installer/Makefile.in 2016-06-08 09:04:03.153657968 +0200 | |
3 | @@ -160,6 +160,57 @@ | |
4 | -diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt | |
5 | rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt | |
6 | ||
7 | +# Add pkg-config files to the install:: target | |
8 | +pkg_config_files = \ | |
9 | + libxul.pc \ | |
10 | + libxul-embedding.pc \ | |
11 | + mozilla-js.pc \ | |
12 | + mozilla-plugin.pc \ | |
13 | + $(NULL) | |
14 | + | |
15 | +ifdef MOZ_NATIVE_NSPR | |
16 | +NSPR_NAME=nspr | |
17 | +NSPR_VERSION=$(shell $(NSPR_CONFIG) --version) | |
18 | +else | |
19 | +pkg_config_files += mozilla-nspr.pc | |
20 | +NSPR_NAME=mozilla-nspr | |
21 | +FULL_NSPR_CFLAGS=-I\$${includedir} | |
22 | +FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs)) | |
23 | +NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version) | |
24 | +endif | |
25 | + | |
26 | +MOZ_XUL_LINK = -lxpcomglue_s -lxul | |
27 | +ifdef JS_SHARED_LIBRARY | |
28 | +MOZ_JS_LINK = -lmozjs | |
29 | +else | |
30 | +FINDPATH=bin | |
31 | +MOZ_JS_LINK = $(MOZ_XUL_LINK) | |
32 | +endif | |
33 | + | |
34 | +%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) | |
35 | + cat $< | sed \ | |
36 | + -e "s|%prefix%|$(prefix)|" \ | |
37 | + -e "s|%includedir%|$(includedir)|" \ | |
38 | + -e "s|%idldir%|$(idldir)|" \ | |
39 | + -e "s|%sdkdir%|$(sdkdir)|" \ | |
40 | + -e "s|%libdir%|$(installdir)|" \ | |
41 | + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ | |
42 | + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ | |
43 | + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ | |
44 | + -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ | |
45 | + -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ | |
46 | + -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ | |
47 | + -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \ | |
48 | + -e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \ | |
49 | + -e "s|%MOZ_JS_LINK%|$(MOZ_JS_LINK)|" > $@ | |
50 | + chmod 644 $@ | |
51 | + | |
52 | +install:: $(pkg_config_files) | |
53 | + @echo pkg_config_file: $(pkg_config_files) | |
54 | + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig | |
55 | + | |
56 | +GARBAGE += $(pkg_config_files) | |
57 | + | |
58 | installer:: | |
59 | ifdef INSTALLER_DIR | |
60 | $(MAKE) -C $(INSTALLER_DIR) | |
61 | --- /dev/null 2016-06-08 08:45:36.745941113 +0200 | |
62 | +++ firefox-47.0/browser/installer/libxul-embedding.pc.in 2016-06-08 09:03:04.106295573 +0200 | |
63 | @@ -0,0 +1,11 @@ | |
64 | +prefix=%prefix% | |
65 | +sdkdir=%sdkdir% | |
66 | +includedir=%includedir% | |
67 | +idldir=%idldir% | |
68 | + | |
69 | +Name: libxul-embedding | |
70 | +Description: Static library for version-independent embedding of the Mozilla runtime | |
71 | +Version: %MOZILLA_VERSION% | |
72 | +Requires: %NSPR_NAME% >= %NSPR_VERSION% | |
73 | +Libs: -L${sdkdir}/lib -lxpcomglue -ldl | |
74 | +Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% | |
75 | --- /dev/null 2016-06-08 08:45:36.745941113 +0200 | |
76 | +++ firefox-47.0/browser/installer/libxul.pc.in 2016-06-08 09:03:44.546774985 +0200 | |
77 | @@ -0,0 +1,12 @@ | |
78 | +prefix=%prefix% | |
79 | +sdkdir=%sdkdir% | |
80 | +libdir=%libdir% | |
81 | +includedir=%includedir% | |
82 | +idldir=%idldir% | |
83 | + | |
84 | +Name: libxul | |
85 | +Description: The Mozilla Runtime and Embedding Engine | |
86 | +Version: %MOZILLA_VERSION% | |
87 | +Requires: %NSPR_NAME% >= %NSPR_VERSION% | |
88 | +Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% | |
89 | +Cflags: -I${includedir} %WCHAR_CFLAGS% | |
90 | --- /dev/null 2016-06-08 08:45:36.745941113 +0200 | |
91 | +++ firefox-47.0/browser/installer/mozilla-js.pc.in 2016-06-08 09:03:36.890018556 +0200 | |
92 | @@ -0,0 +1,10 @@ | |
93 | +prefix=%prefix% | |
94 | +sdkdir=%sdkdir% | |
95 | +includedir=%includedir% | |
96 | + | |
97 | +Name: JavaScript | |
98 | +Description: The Mozilla JavaScript Library | |
99 | +Version: %MOZILLA_VERSION% | |
100 | +Requires: %NSPR_NAME% >= %NSPR_VERSION% | |
101 | +Libs: -L${sdkdir}/lib %MOZ_JS_LINK% | |
102 | +Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX | |
103 | --- /dev/null 2016-06-08 08:45:36.745941113 +0200 | |
104 | +++ firefox-47.0/browser/installer/mozilla-nspr.pc.in 2016-05-03 07:31:12.000000000 +0200 | |
105 | @@ -0,0 +1,11 @@ | |
106 | +prefix=%prefix% | |
107 | +sdkdir=%sdkdir% | |
108 | +includedir=%includedir%/nspr | |
109 | + | |
110 | +Name: NSPR | |
111 | +Description: The Netscape Portable Runtime | |
112 | +Version: %NSPR_VERSION% | |
113 | +Libs: %FULL_NSPR_LIBS% | |
114 | +Cflags: %FULL_NSPR_CFLAGS% | |
115 | + | |
116 | + | |
117 | --- /dev/null 2016-06-08 08:45:36.745941113 +0200 | |
118 | +++ firefox-47.0/browser/installer/mozilla-nss.pc.in 2016-05-03 07:31:12.000000000 +0200 | |
119 | @@ -0,0 +1,10 @@ | |
120 | +prefix=%prefix% | |
121 | +sdkdir=%sdkdir% | |
122 | +includedir=%includedir%/nss | |
123 | + | |
124 | +Name: NSS | |
125 | +Description: Mozilla Network Security Services | |
126 | +Version: %MOZILLA_VERSION% | |
127 | +Requires: %NSPR_NAME% >= %NSPR_VERSION% | |
128 | +Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3 | |
129 | +Cflags: -I${includedir} | |
130 | --- /dev/null 2016-06-08 08:45:36.745941113 +0200 | |
131 | +++ firefox-47.0/browser/installer/mozilla-plugin.pc.in 2016-05-03 07:31:12.000000000 +0200 | |
132 | @@ -0,0 +1,8 @@ | |
133 | +prefix=%prefix% | |
134 | +sdkdir=%sdkdir% | |
135 | +includedir=%includedir% | |
136 | + | |
137 | +Name: Mozilla Plug-In API | |
138 | +Description: Mozilla Plug-In API | |
139 | +Version: %MOZILLA_VERSION% | |
140 | +Cflags: -I${includedir} -DXP_UNIX |