From 5652623e52bd99d98e44eefa6f0393a7f9eaa617 Mon Sep 17 00:00:00 2001 From: Andrew Crerar Date: Thu, 14 Dec 2017 14:08:56 +0000 Subject: [PATCH] [aurora] install-dir.patch Patch-Source: https://github.com/archlinux/svntogit-community/blob/557ec3a987fa078d42956ae1adf7f2a8dc747963/trunk/firefox-install-dir.patch --- browser/branding/aurora/configure.sh | 1 - config/baseconfig.mk | 2 +- toolkit/mozapps/installer/packager.mk | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/browser/branding/aurora/configure.sh b/browser/branding/aurora/configure.sh index 19d4ff057f73b..2c79e136cc67b 100644 --- a/browser/branding/aurora/configure.sh +++ b/browser/branding/aurora/configure.sh @@ -3,5 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MOZ_APP_DISPLAYNAME="Firefox Developer Edition" -MOZ_APP_REMOTINGNAME=firefox-dev MOZ_DEV_EDITION=1 diff --git a/config/baseconfig.mk b/config/baseconfig.mk index 7e5d947de6ee6..23303e24769ae 100644 --- a/config/baseconfig.mk +++ b/config/baseconfig.mk @@ -2,7 +2,7 @@ # directly in python/mozbuild/mozbuild/base.py for gmake validation. # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending # whether a normal build is happening or whether the check is running. -installdir = $(libdir)/$(MOZ_APP_NAME) +installdir = $(libdir)/$(MOZ_APP_NAME)-developer-edition ifeq (.,$(DEPTH)) DIST = dist else diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 53267f07454be..00b08bfa72ceb 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -172,8 +172,8 @@ endif (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ (cd $(DESTDIR)$(installdir) && tar -xf -) $(NSINSTALL) -D $(DESTDIR)$(bindir) - $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) - ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) + $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)-developer-edition + ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)-developer-edition upload: $(PYTHON3) -u $(MOZILLA_DIR)/build/upload.py --base-path $(ABS_DIST) $(UPLOAD_FILES) -- 2.56.0