From 8d6970fb5cb73c9983c23e34cf99016b170c4329 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@anakreon.cz>
Date: Wed, 30 Jul 2014 10:23:31 +0200
Subject: [PATCH] Fixed build directory location

---
 thunderbird-mozconfig |  1 -
 thunderbird.spec      | 13 +++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 0d4916f..6766922 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -1,6 +1,5 @@
 mk_add_options MOZ_CO_PROJECT=mail
 ac_add_options --enable-application=mail
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
 mk_add_options AUTOCONF=autoconf-2.13
 
 #ac_add_options --with-system-png
diff --git a/thunderbird.spec b/thunderbird.spec
index 9307575..2723cbe 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -40,7 +40,9 @@
 #
 # IMPORTANT: If there is no top level directory, this should be 
 # set to the cwd, ie: '.'
-%define tarballdir comm-esr31
+%define tarballdir   comm-esr31
+%define objdir       objdir
+%define mozappdir    %{_libdir}/%{name}
 
 %define official_branding 1
 # enable crash reporter only for iX86
@@ -50,7 +52,6 @@
 %define enable_mozilla_crashreporter 0
 %endif
 
-%define mozappdir         %{_libdir}/%{name}
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
@@ -272,17 +273,17 @@ MOZ_SMP_FLAGS=-j1
 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
 %endif
 
-make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
+make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_OBJDIR="%{objdir}"
 
 # create debuginfo for crash-stats.mozilla.com
 %if %{enable_mozilla_crashreporter}
-make -C objdir buildsymbols
+make -C %{objdir} buildsymbols
 %endif
 
 #===============================================================================
 
 %install
-cd %{tarballdir}/objdir
+cd %{tarballdir}/%{objdir}
 
 DESTDIR=$RPM_BUILD_ROOT make install
 
@@ -359,7 +360,7 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 # Add debuginfo for crash-stats.mozilla.com 
 %if %{enable_mozilla_crashreporter}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{moz_debug_dir}
-%{__cp} objdir/mozilla/dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir}
+%{__cp} %{objdir}/mozilla/dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir}
 %endif
 
 #===============================================================================