From fa9d4b612f3e7562047aa253fad78736eb107af5 Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@redhat.com>
Date: Thu, 21 Apr 2011 14:38:20 -0700
Subject: [PATCH] Just use topsrcdir as our objdir

This matches how most Fedora packages get built.

It also matches what we do in xulrunner
---
 thunderbird-mozconfig | 2 +-
 thunderbird.spec      | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig
index 8db276b..6b5fc85 100644
--- a/thunderbird-mozconfig
+++ b/thunderbird-mozconfig
@@ -1,6 +1,6 @@
 mk_add_options MOZ_CO_PROJECT=mail
 ac_add_options --enable-application=mail
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@
 mk_add_options AUTOCONF=autoconf-2.13
 
 #ac_add_options --with-system-png
diff --git a/thunderbird.spec b/thunderbird.spec
index eff5460..79f2a30 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -5,7 +5,6 @@
 %define sqlite_version 3.6.14
 %define libnotify_version 0.4
 %define build_langpacks 1
-%define moz_objdir objdir-tb
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
 
 # The tarball is pretty inconsistent with directory structure.
@@ -186,7 +185,6 @@ make -f client.mk build
 
 # create debuginfo for crash-stats.mozilla.com
 %if %{enable_mozilla_crashreporter}
-cd %{moz_objdir}
 make buildsymbols
 %endif
 
@@ -200,9 +198,7 @@ INTERNAL_GECKO=%{version_internal}
 INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
 MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
 
-cd %{moz_objdir}
 DESTDIR=$RPM_BUILD_ROOT make install
-cd -
 
 # install icons
 for s in 16 22 24 32 48 256; do
@@ -292,7 +288,7 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 # Debug symbols are stored in /usr/lib even in x86_64 arch
 DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"`
 mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
-cp objdir-tb/mozilla/dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
+cp dist/%{name}-%{version}*.crashreporter-symbols.zip $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir}
 %endif
 
 #===============================================================================