From c1ab6ac2493f90e3b45662881dfabcf69654f2b7 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 4 Jan 2012 02:57:20 -0500
Subject: build icecat and iceweasel in $srcdir/mozilla-build

---
 mozilla-testing/icecat/PKGBUILD          | 5 +++--
 mozilla-testing/iceweasel-libre/PKGBUILD | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/mozilla-testing/icecat/PKGBUILD b/mozilla-testing/icecat/PKGBUILD
index 9f8854084..4379ee60c 100644
--- a/mozilla-testing/icecat/PKGBUILD
+++ b/mozilla-testing/icecat/PKGBUILD
@@ -77,7 +77,8 @@ if [ "$_pkgname" != "$pkgname" ]; then
 fi
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  mv "$_pkgname-$pkgver" "$srcdir/mozilla-build"
+  cd "$srcdir/mozilla-build"
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
   patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
@@ -104,7 +105,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/mozilla-build"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index 87169dda0..f7d4df12f 100644
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -105,12 +105,9 @@ build() {
   cd "${srcdir}"
   dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
 
-  # This will make life more sane
-  cd "${srcdir}"
-  ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}"
-
   msg2 "Starting normal build..."
-  cd "$srcdir/$_pkgname-$pkgver"
+  mv "${_debname}-${_debver}" "$srcdir/mozilla-build"
+  cd "$srcdir/mozilla-build"
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
@@ -139,7 +136,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/mozilla-build"
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
-- 
cgit v1.2.3