summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in8
-rw-r--r--config/config.mk3
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 55180c70..c1313b86 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,14 @@ DIRS = config pr lib
ifdef MOZILLA_CLIENT
PR_CLIENT_BUILD = 1
PR_CLIENT_BUILD_UNIX = 1
+# Make nsinstall use absolute symlinks by default for Mozilla OSX builds
+# http://bugzilla.mozilla.org/show_bug.cgi?id=193164
+ifeq ($(OS_ARCH),Darwin)
+ifndef NSDISTMODE
+NSDISTMODE=absolute_symlink
+export NSDISTMODE
+endif
+endif
endif
DIST_GARBAGE = config.cache config.log config.status
diff --git a/config/config.mk b/config/config.mk
index 205a5395..815291a1 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -77,9 +77,6 @@ endef
LINK_DLL = $(LD) $(OS_DLLFLAGS) $(DLLFLAGS)
ifeq ($(OS_ARCH),Darwin)
-ifndef NSDISTMODE
-NSDISTMODE=absolute_symlink
-endif
PWD := $(shell pwd)
endif