| 1234567891011121314151617181920212223242526272829303132333435363738394041 |
- From 67c1d7d66d99494102832e12059a84fa439c88e0 Mon Sep 17 00:00:00 2001
- From: Sukhbir Singh <sukhbir@torproject.org>
- Date: Tue, 12 Jun 2018 21:58:24 -0400
- Subject: [PATCH] Bug 26205: Don't build the uninstaller for Windows during
- Firefox compilation
- diff --git a/browser/Makefile.in b/browser/Makefile.in
- index 2eb9e708f68e..0c9442183942 100644
- --- a/browser/Makefile.in
- +++ b/browser/Makefile.in
- @@ -6,10 +6,6 @@ include $(topsrcdir)/config/rules.mk
-
- ifdef MAKENSISU
-
- -# For Windows build the uninstaller during the application build since the
- -# uninstaller is included with the application for mar file generation.
- -libs::
- - $(MAKE) -C installer/windows uninstaller
- ifdef MOZ_MAINTENANCE_SERVICE
- $(MAKE) -C installer/windows maintenanceservice_installer
- endif
- diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
- index 0325f0ffab9a..a5a9488623a3 100644
- --- a/browser/installer/Makefile.in
- +++ b/browser/installer/Makefile.in
- @@ -98,10 +98,6 @@ ifdef NECKO_WIFI
- DEFINES += -DNECKO_WIFI
- endif
-
- -ifdef MAKENSISU
- -DEFINES += -DHAVE_MAKENSISU=1
- -endif
- -
- ifdef MOZ_DEFAULT_BROWSER_AGENT
- DEFINES += -DMOZ_DEFAULT_BROWSER_AGENT=1
- endif
- --
- 2.27.0
|
