3 files changed, 11 insertions, 15 deletions
diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index 5392a2bb8..c0febff7c 100644
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -137,19 +137,15 @@ package() {
 
   install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref"
 
-  # For some crazy reason, pgo moves the branding (and many other non-object
-  # files) to odd locations in the ff-pgo directory.
+  # I don't even know why we're hitting the objdir, and ConnOS didn't.
   _brandingdir=debian/branding
-  if $_pgo; then
-    brandingdir=ff-pgo/dist/branding
-  else
-    brandingdir=$_brandingdir
-  fi
-  for i in 16x16 32x32 48x48; do
-    install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$_pkgname.png"
+  brandingdir=moz-objdir/$_brandingdir
+  icondir="$pkgdir/usr/share/icons/hicolor"
+  for i in 16x16 32x32 48x48 64x64; do
+    install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png"
   done
-  install -Dm644 "$brandingdir/mozicon128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$_pkgname.png"
-  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg"
+  install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png"
+  install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg"
 
   install -d                                  "$pkgdir/usr/share/applications"
   install -m644 debian/iceweasel.desktop      "$pkgdir/usr/share/applications"
@@ -165,14 +161,14 @@ package() {
   rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
 
   # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $_pkgname "$_pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
+  ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin"
 }
 
 md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
          '6cde9fe38df1434fdcc0f3a078b0238e'
          'd9b5f2a893ad80da492aec8c9a7cbb7c'
-         '1e3b075fd7963fe59c0687027637304d'
-         '27236cf92251e2e6a01e820e1d13e5d2'
+         'eab149c1994ab14392e55af3abb08e80'
+         'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
          '3c1a7d6984b47a0ab36a5d8e6672cb2b'
          'e529742c0a425648087bc3ce537fe4c5'
diff --git a/mozilla-testing/iceweasel-libre/mozconfig b/mozilla-testing/iceweasel-libre/mozconfig
index 9a0cc9ea3..e79896323 100644
--- a/mozilla-testing/iceweasel-libre/mozconfig
+++ b/mozilla-testing/iceweasel-libre/mozconfig
@@ -35,6 +35,7 @@ ac_add_options --enable-optimize
 
 export MOZILLA_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Iceweasel
 ac_add_options --disable-official-branding
diff --git a/mozilla-testing/iceweasel-libre/mozconfig.pgo b/mozilla-testing/iceweasel-libre/mozconfig.pgo
index 3509ec03f..b0c249ebf 100644
--- a/mozilla-testing/iceweasel-libre/mozconfig.pgo
+++ b/mozilla-testing/iceweasel-libre/mozconfig.pgo
@@ -1,5 +1,4 @@
 # PGO
 ac_add_options --enable-profile-guided-optimization
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
 mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'