From ab3d8585f1b7fd3a10434ae6fe6a5cf89fef8256 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 22 Apr 2014 16:10:51 +0200 Subject: Update to Firefox 29 build 1 --- firefox-install-dir.patch | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'firefox-install-dir.patch') diff --git a/firefox-install-dir.patch b/firefox-install-dir.patch index 9527700..51fe4ba 100644 --- a/firefox-install-dir.patch +++ b/firefox-install-dir.patch @@ -1,20 +1,12 @@ -diff -up mozilla-release/config/baseconfig.mk.orig mozilla-release/config/baseconfig.mk ---- mozilla-release/config/baseconfig.mk.orig 2013-12-09 15:07:53.357724904 +0100 -+++ mozilla-release/config/baseconfig.mk 2013-12-09 15:08:35.819797392 +0100 -@@ -1,6 +1,6 @@ +diff -up firefox-29.0/mozilla-release/config/baseconfig.mk.orig firefox-29.0/mozilla-release/config/baseconfig.mk +--- mozilla-release/config/baseconfig.mk.orig 2014-04-22 15:38:52.948165295 +0200 ++++ mozilla-release/config/baseconfig.mk 2014-04-22 15:42:20.387481673 +0200 +@@ -4,7 +4,7 @@ + # whether a normal build is happening or whether the check is running. 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) +installdir = $(libdir)/$(MOZ_APP_NAME) sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - DIST = $(DEPTH)/dist - -diff -up mozilla-release/js/src/config/baseconfig.mk.orig mozilla-release/js/src/config/baseconfig.mk ---- mozilla-release/js/src/config/baseconfig.mk.orig 2013-12-09 15:07:53.357724904 +0100 -+++ mozilla-release/js/src/config/baseconfig.mk 2013-12-09 15:09:06.906850462 +0100 -@@ -1,4 +1,4 @@ --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - - ifneq (,$(filter /%,$(TOP_DIST))) + ifndef TOP_DIST + TOP_DIST = dist -- cgit