equal
deleted
inserted
replaced
12 INSTALL_SDK = 1 |
12 INSTALL_SDK = 1 |
13 |
13 |
14 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
14 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
15 |
15 |
16 +# the apilibdir always ends with 1.9 as every patch update will provide a link |
16 +# the apilibdir always ends with 1.9 as every patch update will provide a link |
17 +apilibdir = $(dir $(installdir))xulrunner-2.0 |
17 +apilibdir = $(dir $(installdir))xulrunner-2.2 |
18 + |
18 + |
19 $(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile |
19 # Add pkg-config files to the install:: target |
20 printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \ |
|
21 $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@ |
|
22 |
20 |
23 ifndef SKIP_GRE_REGISTRATION |
21 pkg_config_files = \ |
24 # to register xulrunner per-user, override this with $HOME/.gre.d |
22 libxul.pc \ |
25 regdir = /etc/gre.d |
23 libxul-embedding.pc \ |
26 |
24 mozilla-js.pc \ |
27 @@ -116,16 +119,17 @@ pkg_config_files += mozilla-nss.pc |
25 mozilla-plugin.pc \ |
|
26 mozilla-gtkmozembed.pc \ |
|
27 @@ -103,16 +106,17 @@ pkg_config_files += mozilla-nss.pc |
28 endif |
28 endif |
29 |
29 |
30 %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) |
30 %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) |
31 cat $< | sed \ |
31 cat $< | sed \ |
32 -e "s|%prefix%|$(prefix)|" \ |
32 -e "s|%prefix%|$(prefix)|" \ |