summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-05-17 15:38:36 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-05-17 15:38:36 -0300
commit2fdd49525d1a65b405edde7d2756f6b3d228550a (patch)
treeff127a0d1e9038c1035f78de552ee055e1803047
parent0c41421f8445a5820d1c98d433bae15944d8fcd4 (diff)
iceweasel-libre: fixing build issues
-rw-r--r--libre/iceweasel-libre/PKGBUILD11
1 files changed, 7 insertions, 4 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 774d80f92..f84c8e745 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -142,20 +142,23 @@ build() {
if $_pgo; then
export DISPLAY=:99
Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+
+ if ! make -f client.mk build MOZ_PGO=1; then
+ kill $!
+ return 1
+ fi
- make -f client.mk build MOZ_PGO=1
+ kill $! || true
else
make -f client.mk build
fi
-
- kill $! || true
}
package() {
cd "$srcdir/$DEBIAN_BUILD"
make -f client.mk DESTDIR="$pkgdir" install
- install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js"
+ install -Dm644 ../vendor.js "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
# I don't even know why we're hitting the objdir, and ConnOS didn't
_brandingdir=debian/branding