← Back to branch summary

~oem-solutions-group/firefox/firefox-3.0.dennis

« back to all changes in this revision

Viewing changes to debian/patches/installer_shouldnt_copy_xulrunner.patch

  • Committer: Nicolas Valcarcel Scerpella
  • Date: 2010-06-30 19:15:40 UTC
  • Revision ID: nvalcarcel@canonical.com-20100630191540-siqaxe8ab11kn4dx
reverted for re-merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/installer_shouldnt_copy_xulrunner.patch
 
1
---
 
2
 config/rules.mk |    5 +++++
 
3
 1 file changed, 5 insertions(+)
 
4
 
 
5
Index: mozilla/config/rules.mk
 
6
===================================================================
 
7
--- mozilla.orig/config/rules.mk
 
8
+++ mozilla/config/rules.mk
 
9
@@ -57,16 +57,21 @@
 
10
 REPORT_BUILD = @echo $(notdir $<)
 
11
 
 
12
 ifeq ($(OS_ARCH),OS2)
 
13
 EXEC                   =
 
14
 else
 
15
 EXEC                   = exec
 
16
 endif
 
17
 
 
18
+# Don't copy xulrunner files at install time, when using system xulrunner
 
19
+ifdef LIBXUL_SDK
 
20
+  SKIP_COPY_XULRUNNER=1
 
21
+endif
 
22
+
 
23
 # ELOG prints out failed command when building silently (gmake -s).
 
24
 ifneq (,$(findstring -s,$(MAKEFLAGS)))
 
25
   ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
 
26
 else
 
27
   ELOG :=
 
28
 endif
 
29
 
 
30
 ifeq ($(MOZ_OS2_TOOLS),VACPP)