summaryrefslogtreecommitdiffstats
path: root/application/palemoon/installer/Makefile.in
diff options
context:
space:
mode:
authorJustOff <Off.Just.Off@gmail.com>2018-04-14 19:18:40 +0300
committerJustOff <Off.Just.Off@gmail.com>2018-04-14 19:18:40 +0300
commit01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125 (patch)
tree69438df6a5406510ead01d5406872a9ca0ee1122 /application/palemoon/installer/Makefile.in
parent25370b7f0cc8709821acc8b7826c2c6e38268c67 (diff)
parent64204fdb8302c8bf483d724430dd83f43c1cb6ff (diff)
downloadUXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.gz
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.lz
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.tar.xz
UXP-01b5b8fd8a096ab4c3f683f0cdd7bdab98a63125.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP and resolve conflicts
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 =