From 4e8207d864d8b3bd955984348ae1c7346ad40a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Fri, 12 Oct 2012 05:45:55 -0200
Subject: iceweasel-libre-16.0.1.1-1: fixing issues in
 iceweasel-install-dir.patch

---
 libre/iceweasel-libre/PKGBUILD                    |  2 +-
 libre/iceweasel-libre/iceweasel-install-dir.patch | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'libre/iceweasel-libre')

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 4e177229c..fc68357e7 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -58,7 +58,7 @@ md5sums=('33e50f7ddfa7274e5a3bd393c37fb3b3'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
          '8768dfc39e9f1057c2956bf4405ae58e'
-         'cc5c68c8851eeed694e7e933779a0f16'
+         'abf5ecb74caa857abb42bcfbb3442d9c'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93'
          '0a31239f1008038df5057982fe745dec')
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch
index e9ca4aa38..a44aef496 100644
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre/iceweasel-libre/iceweasel-install-dir.patch
@@ -1,13 +1,14 @@
 diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk
 --- iceweasel-16.0.1.orig/config/baseconfig.mk	2012-10-10 19:42:45.000000000 -0200
-+++ iceweasel-16.0.1/config/baseconfig.mk	2012-10-12 05:07:39.393233306 -0200
-@@ -1,9 +1,9 @@
++++ iceweasel-16.0.1/config/baseconfig.mk	2012-10-12 05:40:32.346949927 -0200
+@@ -1,10 +1,10 @@
  INCLUDED_AUTOCONF_MK = 1
  
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION)
 +includedir := $(includedir)/$(MOZ_APP_NAME)
 +idldir = $(datadir)/idl/$(MOZ_APP_NAME)
 +installdir = $(libdir)/$(MOZ_APP_NAME)
-- 
cgit v1.2.3-2-g168b