| 1 | From 5652623e52bd99d98e44eefa6f0393a7f9eaa617 Mon Sep 17 00:00:00 2001
|
| 2 | From: Andrew Crerar <[email protected]>
|
| 3 | Date: Thu, 14 Dec 2017 14:08:56 +0000
|
| 4 | Subject: [PATCH] [aurora] install-dir.patch
|
| 5 |
|
| 6 | Patch-Source: https://github.com/archlinux/svntogit-community/blob/557ec3a987fa078d42956ae1adf7f2a8dc747963/trunk/firefox-install-dir.patch
|
| 7 | ---
|
| 8 | browser/branding/aurora/configure.sh | 1 -
|
| 9 | config/baseconfig.mk | 2 +-
|
| 10 | toolkit/mozapps/installer/packager.mk | 4 ++--
|
| 11 | 3 files changed, 3 insertions(+), 4 deletions(-)
|
| 12 |
|
| 13 | diff --git a/browser/branding/aurora/configure.sh b/browser/branding/aurora/configure.sh
|
| 14 | index 19d4ff057f73b..2c79e136cc67b 100644
|
| 15 | |
| 16 | |
| 17 | @@ -3,5 +3,4 @@
|
| 18 | # file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
| 19 |
|
| 20 | MOZ_APP_DISPLAYNAME="Firefox Developer Edition"
|
| 21 | -MOZ_APP_REMOTINGNAME=firefox-dev
|
| 22 | MOZ_DEV_EDITION=1
|
| 23 | diff --git a/config/baseconfig.mk b/config/baseconfig.mk
|
| 24 | index 7e5d947de6ee6..23303e24769ae 100644
|
| 25 | |
| 26 | |
| 27 | @@ -2,7 +2,7 @@
|
| 28 | # directly in python/mozbuild/mozbuild/base.py for gmake validation.
|
| 29 | # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
|
| 30 | # whether a normal build is happening or whether the check is running.
|
| 31 | -installdir = $(libdir)/$(MOZ_APP_NAME)
|
| 32 | +installdir = $(libdir)/$(MOZ_APP_NAME)-developer-edition
|
| 33 | ifeq (.,$(DEPTH))
|
| 34 | DIST = dist
|
| 35 | else
|
| 36 | diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
|
| 37 | index 53267f07454be..00b08bfa72ceb 100644
|
| 38 | |
| 39 | |
| 40 | @@ -172,8 +172,8 @@ endif
|
| 41 | (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
|
| 42 | (cd $(DESTDIR)$(installdir) && tar -xf -)
|
| 43 | $(NSINSTALL) -D $(DESTDIR)$(bindir)
|
| 44 | - $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
|
| 45 | - ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
|
| 46 | + $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)-developer-edition
|
| 47 | + ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)-developer-edition
|
| 48 |
|
| 49 | upload:
|
| 50 | $(PYTHON3) -u $(MOZILLA_DIR)/build/upload.py --base-path $(ABS_DIST) $(UPLOAD_FILES)
|
| 51 | --
|
| 52 | 2.56.0
|
| 53 |
|