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

Fixed build directory location

Browse Source
This commit is contained in:
Martin Stransky 2014-07-30 10:23:31 +02:00
parent 79087eff44
commit 8d6970fb5c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
thunderbird-mozconfig
View File

@ -1,6 +1,5 @@
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
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

11
thunderbird.spec
View File

@ -41,6 +41,8 @@
# IMPORTANT: If there is no top level directory, this should be # IMPORTANT: If there is no top level directory, this should be
# set to the cwd, ie: '.' # set to the cwd, ie: '.'
%define tarballdir comm-esr31 %define tarballdir comm-esr31
%define objdir objdir
%define mozappdir %{_libdir}/%{name}
%define official_branding 1 %define official_branding 1
# enable crash reporter only for iX86 # enable crash reporter only for iX86
@ -50,7 +52,6 @@
%define enable_mozilla_crashreporter 0 %define enable_mozilla_crashreporter 0
%endif %endif
%define mozappdir %{_libdir}/%{name}
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
@ -272,17 +273,17 @@ MOZ_SMP_FLAGS=-j1
[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
%endif %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 # create debuginfo for crash-stats.mozilla.com
%if %{enable_mozilla_crashreporter} %if %{enable_mozilla_crashreporter}
make -C objdir buildsymbols make -C %{objdir} buildsymbols
%endif %endif
#=============================================================================== #===============================================================================
%install %install
cd %{tarballdir}/objdir cd %{tarballdir}/%{objdir}
DESTDIR=$RPM_BUILD_ROOT make install 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 # Add debuginfo for crash-stats.mozilla.com
%if %{enable_mozilla_crashreporter} %if %{enable_mozilla_crashreporter}
%{__mkdir_p} $RPM_BUILD_ROOT/%{moz_debug_dir} %{__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 %endif
#=============================================================================== #===============================================================================