rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Just use topsrcdir as our objdir

Browse Source 
This matches how most Fedora packages get built.

It also matches what we do in xulrunner
This commit is contained in:
Christopher Aillon 2011-04-21 14:38:20 -07:00
parent 2d819a7fc0
commit fa9d4b612f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thunderbird-mozconfig
View File

@ -1,6 +1,6 @@
mk_add_options MOZ_CO_PROJECT=mail mk_add_options MOZ_CO_PROJECT=mail
ac_add_options --enable-application=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 mk_add_options AUTOCONF=autoconf-2.13
#ac_add_options --with-system-png #ac_add_options --with-system-png

6
thunderbird.spec
View File

@ -5,7 +5,6 @@
%define sqlite_version 3.6.14 %define sqlite_version 3.6.14
%define libnotify_version 0.4 %define libnotify_version 0.4
%define build_langpacks 1 %define build_langpacks 1
%define moz_objdir objdir-tb
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
# The tarball is pretty inconsistent with directory structure. # The tarball is pretty inconsistent with directory structure.
@ -186,7 +185,6 @@ make -f client.mk build
# create debuginfo for crash-stats.mozilla.com # create debuginfo for crash-stats.mozilla.com
%if %{enable_mozilla_crashreporter} %if %{enable_mozilla_crashreporter}
cd %{moz_objdir}
make buildsymbols make buildsymbols
%endif %endif
@ -200,9 +198,7 @@ INTERNAL_GECKO=%{version_internal}
INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO} INTERNAL_APP_NAME=%{name}-${INTERNAL_GECKO}
MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME} MOZ_APP_DIR=%{_libdir}/${INTERNAL_APP_NAME}
cd %{moz_objdir}
DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT make install
cd -
# install icons # install icons
for s in 16 22 24 32 48 256; do 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 symbols are stored in /usr/lib even in x86_64 arch
DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"` DEBUG_LIB_DIR=`echo %{_libdir}|sed -e "s/lib64/lib/"`
mkdir -p $RPM_BUILD_ROOT$DEBUG_LIB_DIR/debug%{mozappdir} 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 %endif
#=============================================================================== #===============================================================================