From 1f9141928e1ffc908e5218dcb4a448f65edd12b3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 30 Jul 2006 04:08:01 +0000 Subject: pass --libdir to configure --- .cvsignore | 1 + firefox-mozconfig | 1 + firefox.spec | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index d03a150..60a54bf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ firefox-1.5.0.5-source.tar.bz2 firefox-langpacks-1.5.0.5-20060726.tar.bz2 +firefox-mozconfig diff --git a/firefox-mozconfig b/firefox-mozconfig index e932989..f224b28 100755 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -1,6 +1,7 @@ . $topsrcdir/browser/config/mozconfig ac_add_options --prefix="$PREFIX" +ac_add_options --libdir="$LIBDIR" ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-jpeg diff --git a/firefox.spec b/firefox.spec index 524a8a6..e722edf 100644 --- a/firefox.spec +++ b/firefox.spec @@ -11,7 +11,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.5.0.5 -Release: 7 +Release: 8 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -156,6 +156,7 @@ removed in favor of xulrunner-devel. export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/` export PREFIX='%{_prefix}' +export LIBDIR='%{_libdir}' %ifarch ppc ppc64 s390 s390x %define moz_make_flags -j1 @@ -353,6 +354,9 @@ fi #--------------------------------------------------------------------- %changelog +* Sun Jul 30 2006 Matthias Clasen - 1.5.0.5-8 +- Pass --libdir to configure + * Fri Jul 28 2006 Christopher Aillon - 1.5.0.5-7 - Dereference links in %%install so the files get put in the right place. -- cgit