Only force the use of absolute symlinks on Darwin when building Mozilla. NSPRPUB_PRE_4_2_CLIENT_BRANCH
authorseawood%netscape.com
Wed, 26 Feb 2003 00:47:43 +0000
branchNSPRPUB_PRE_4_2_CLIENT_BRANCH
changeset 2722 729a3ce68d8cb90d8fa1c93913e242b74bdddf97
parent 2720 3973df6525afe62c7f3dea4a8004662070134968
child 2726 a633c909dbe37a780a6b03e90b1124f578860523
push idunknown
push userunknown
push dateunknown
bugs193164
Only force the use of absolute symlinks on Darwin when building Mozilla. Bug #193164 r=wtc
Makefile.in
config/config.mk
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,16 +43,24 @@ include $(MOD_DEPTH)/config/autoconf.mk
 
 MAKE := $(patsubst -j%,,$(MAKE)) -j1
 
 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
 
 all:: config.status export
 
 include $(topsrcdir)/config/rules.mk
 
--- a/config/config.mk
+++ b/config/config.mk
@@ -72,19 +72,16 @@ LDFLAGS		= $(OS_LDFLAGS)
 
 define MAKE_OBJDIR
 if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
 endef
 
 LINK_DLL	= $(LD) $(OS_DLLFLAGS) $(DLLFLAGS)
 
 ifeq ($(OS_ARCH),Darwin)
-ifndef NSDISTMODE
-NSDISTMODE=absolute_symlink
-endif
 PWD := $(shell pwd)
 endif
 
 ifneq (,$(filter WINNT OS2, $(OS_ARCH)))
 INSTALL		= $(NSINSTALL)
 else
 ifeq ($(NSDISTMODE),copy)
 # copy files, but preserve source mtime