summaryrefslogtreecommitdiffstats
path: root/application/palemoon/installer/Makefile.in
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-04-14 10:02:15 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-04-14 10:02:15 -0400
commit02429a51270e8a99d15b3c1a6f443ee5310905f4 (patch)
tree35016d105afd9f2a96fa7ce9d9ab0ddc77ec4de6 /application/palemoon/installer/Makefile.in
parent33406af03999cfdce840f978dcf2e258c32ea8e7 (diff)
downloadUXP-02429a51270e8a99d15b3c1a6f443ee5310905f4.tar
UXP-02429a51270e8a99d15b3c1a6f443ee5310905f4.tar.gz
UXP-02429a51270e8a99d15b3c1a6f443ee5310905f4.tar.lz
UXP-02429a51270e8a99d15b3c1a6f443ee5310905f4.tar.xz
UXP-02429a51270e8a99d15b3c1a6f443ee5310905f4.zip
[PALEMOON] Revise packaging
Diffstat (limited to 'application/palemoon/installer/Makefile.in')
-rw-r--r--application/palemoon/installer/Makefile.in12
1 files changed, 4 insertions, 8 deletions
diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in
index 7ba8ae9e8..7cd77bdca 100644
--- a/application/palemoon/installer/Makefile.in
+++ b/application/palemoon/installer/Makefile.in
@@ -65,18 +65,14 @@ endif
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
# Set MSVC dlls version to package, if any.
-ifdef WIN32_REDIST_DIR
ifdef MOZ_NO_DEBUG_RTL
+ifdef WIN32_REDIST_DIR
DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
-DEFINES += -DMSVC_OPENMP_DLL=$(MSVC_OPENMP_DLL)
-ifdef MSVC_APPCRT_DLL
-DEFINES += -DMSVC_APPCRT_DLL=$(MSVC_APPCRT_DLL)
-endif
-ifdef MSVC_DESKTOPCRT_DLL
-DEFINES += -DMSVC_DESKTOPCRT_DLL=$(MSVC_DESKTOPCRT_DLL)
endif
+ifdef WIN_UCRT_REDIST_DIR
+DEFINES += -DMOZ_PACKAGE_WIN_UCRT_DLLS=1
endif
endif
@@ -161,7 +157,7 @@ endif
libs::
- $(MAKE) -C $(DEPTH)/browser/locales langpack
+ $(MAKE) -C $(DEPTH)/application/palemoon/locales langpack
ifeq (WINNT,$(OS_ARCH))
PKGCOMP_FIND_OPTS =