blob: 8f8137bec4cd65053655c3e0945bf12f4352c7b7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
diff -Nur comm-release.orig/mail/branding/icedove/Makefile.in comm-release/mail/branding/icedove/Makefile.in
--- comm-release.orig/mail/branding/icedove/Makefile.in 2012-04-18 15:42:15.000000000 -0300
+++ comm-release/mail/branding/icedove/Makefile.in 2012-05-08 04:03:25.680643202 -0300
@@ -38,11 +38,11 @@
# Branding Makefile for Icedove branding
DEPTH = ../../..
-topsrcdir = ../../../
+topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
-include $(topsrcdir)/config/autoconf.mk
+include $(DEPTH)/config/autoconf.mk
DIRS = \
locales \
@@ -50,7 +50,7 @@
PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js
-include $(DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
export::
$(NSINSTALL) -D $(DIST)/branding
diff -Nur comm-release.orig/mail/branding/icedove/locales/Makefile.in comm-release/mail/branding/icedove/locales/Makefile.in
--- comm-release.orig/mail/branding/icedove/locales/Makefile.in 2012-04-18 15:42:15.000000000 -0300
+++ comm-release/mail/branding/icedove/locales/Makefile.in 2012-05-08 05:32:57.481620942 -0300
@@ -36,13 +36,13 @@
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
-topsrcdir = ../../../..
+topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = mail/branding/icedove/locales
-include $(topsrcdir)/config/autoconf.mk
+include $(DEPTH)/config/autoconf.mk
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
-include $(DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
|
