]>
Commit | Line | Data |
---|---|---|
54d6358a JR |
1 | --- iceweasel-33.1.1/mozilla/browser/installer/Makefile.in.orig 2014-11-13 23:49:48.000000000 +0100 |
2 | +++ iceweasel-33.1.1/mozilla/browser/installer/Makefile.in 2014-11-26 21:30:58.839109076 +0100 | |
3 | @@ -160,6 +160,56 @@ | |
4 | rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt | |
5 | endif | |
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|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ | |
41 | + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ | |
42 | + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ | |
43 | + -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ | |
44 | + -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ | |
45 | + -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ | |
46 | + -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" \ | |
47 | + -e "s|%MOZ_XUL_LINK%|$(MOZ_XUL_LINK)|" \ | |
48 | + -e "s|%MOZ_JS_LINK%|$(MOZ_JS_LINK)|" > $@ | |
49 | + chmod 644 $@ | |
50 | + | |
51 | +install:: $(pkg_config_files) | |
52 | + @echo pkg_config_file: $(pkg_config_files) | |
53 | + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig | |
54 | + | |
55 | +GARBAGE += $(pkg_config_files) | |
56 | + | |
57 | installer:: | |
58 | ifdef INSTALLER_DIR | |
59 | $(MAKE) -C $(INSTALLER_DIR) |