diff options
Diffstat (limited to 'testing/firefox-developer-edition/install-dir.patch')
-rw-r--r-- | testing/firefox-developer-edition/install-dir.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/testing/firefox-developer-edition/install-dir.patch b/testing/firefox-developer-edition/install-dir.patch new file mode 100644 index 00000000000..537475aa79f --- /dev/null +++ b/testing/firefox-developer-edition/install-dir.patch @@ -0,0 +1,40 @@ + Patch-Source: https://github.com/archlinux/svntogit-community/blob/557ec3a987fa078d42956ae1adf7f2a8dc747963/trunk/firefox-install-dir.patch + +diff --git c/browser/branding/aurora/configure.sh i/browser/branding/aurora/configure.sh +index 19d4ff057f73..2c79e136cc67 100644 +--- c/browser/branding/aurora/configure.sh ++++ i/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 c/config/baseconfig.mk i/config/baseconfig.mk +index 3ef3af95d611..81530dface0a 100644 +--- c/config/baseconfig.mk ++++ i/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 c/toolkit/mozapps/installer/packager.mk i/toolkit/mozapps/installer/packager.mk +index 64f902a26942..d3313dacbcb7 100644 +--- c/toolkit/mozapps/installer/packager.mk ++++ i/toolkit/mozapps/installer/packager.mk +@@ -138,8 +138,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: + $(PYTHON) -u $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) $(UPLOAD_FILES) |