From 6a6d63d8f2e6e04644fcf93d9937508af6eefff2 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@gnu.org>
Date: Thu, 9 Jul 2015 14:03:09 -0500
Subject: Initial adaptation to v38.x

---
 data/buildscripts/build-gnulinux.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'data/buildscripts/build-gnulinux.sh')

diff --git a/data/buildscripts/build-gnulinux.sh b/data/buildscripts/build-gnulinux.sh
index a844af9..86e6199 100644
--- a/data/buildscripts/build-gnulinux.sh
+++ b/data/buildscripts/build-gnulinux.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 set -e
+set -x
 
 apt-get -q -y --force-yes build-dep firefox
+apt-get -q -y --force-yes install libgstreamermm-0.10-dev
 
 cp ../../data/buildscripts/mozconfig-common .mozconfig
 cat ../../data/buildscripts/mozconfig-gnulinux >> .mozconfig
@@ -14,7 +16,9 @@ rm -rf obj-gnulinux
 [ $(arch) = "x86_64" ] || exit 0
 cd obj-gnulinux/browser/locales
 for locale in $(ls ../../../l10n/ -1); do
-    make langpack-$locale LOCALE_MERGEDIR=.
+    rm $PWD/mergedir -rf
+    make merge-$locale LOCALE_MERGEDIR=$PWD/mergedir
+    make langpack-$locale LOCALE_MERGEDIR=$PWD/mergedir
 done
 
 
-- 
cgit v1.2.3