nsis-uninstall.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From e338a77c64c0afb72e857c7daa63346d35ad3891 Mon Sep 17 00:00:00 2001
  2. From: Sukhbir Singh <sukhbir@torproject.org>
  3. Date: Tue, 12 Jun 2018 21:58:24 -0400
  4. Subject: [PATCH 1/1] Bug 26205: Don't build the uninstaller for Windows during
  5. Firefox compilation
  6. ---
  7. browser/Makefile.in | 4 ----
  8. browser/installer/Makefile.in | 4 ----
  9. 2 files changed, 8 deletions(-)
  10. diff --git a/browser/Makefile.in b/browser/Makefile.in
  11. index 2eb9e708f68e..0c9442183942 100644
  12. --- a/browser/Makefile.in
  13. +++ b/browser/Makefile.in
  14. @@ -6,10 +6,6 @@ include $(topsrcdir)/config/rules.mk
  15. ifdef MAKENSISU
  16. -# For Windows build the uninstaller during the application build since the
  17. -# uninstaller is included with the application for mar file generation.
  18. -libs::
  19. - $(MAKE) -C installer/windows uninstaller
  20. ifdef MOZ_MAINTENANCE_SERVICE
  21. $(MAKE) -C installer/windows maintenanceservice_installer
  22. endif
  23. diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
  24. index 1bf11252ee06..dee6d5434106 100644
  25. --- a/browser/installer/Makefile.in
  26. +++ b/browser/installer/Makefile.in
  27. @@ -98,10 +98,6 @@ ifdef NECKO_WIFI
  28. DEFINES += -DNECKO_WIFI
  29. endif
  30. -ifdef MAKENSISU
  31. -DEFINES += -DHAVE_MAKENSISU=1
  32. -endif
  33. -
  34. ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
  35. MOZ_PKG_MAC_DSSTORE=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/dsstore
  36. MOZ_PKG_MAC_BACKGROUND=$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/background.png
  37. --
  38. 2.18.0.rc2