From ebcd46ea012637500a0898511abc68dd3c42b8f4 Mon Sep 17 00:00:00 2001 From: "slamm%netscape.com" Date: Wed, 31 Mar 1999 19:07:29 +0000 Subject: [PATCH] Set MOZILLA_FIVE_HOME for run_apprunner and run_viewer targets. Change the message on the depend target when using compiler-based depend. git-svn-id: svn://10.0.0.236/trunk@25709 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/rules.mk | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index 7a7899e21cf..5c7db28f604 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -401,13 +401,13 @@ checkout: run_viewer: $(DIST)/bin/viewer cd $(DIST)/bin; \ - MOZILLA_FIVE_HOME= ; \ + MOZILLA_FIVE_HOME=`pwd` \ LD_LIBRARY_PATH=".:$(LIBS_PATH):$$LD_LIBRARY_PATH" \ viewer run_apprunner: $(DIST)/bin/apprunner cd $(DIST)/bin; \ - MOZILLA_FIVE_HOME= ; \ + MOZILLA_FIVE_HOME=`pwd` \ LD_LIBRARY_PATH=".:$(LIBS_PATH):$$LD_LIBRARY_PATH" \ apprunner @@ -958,7 +958,19 @@ endif ############################################################################# ifdef COMPILER_DEPEND depend:: - @echo "$(MAKE): Skipping depend. Using compiler-based depend instead (--enable-md)." 2>&1 + @echo "$(MAKE): No need to run depend target.\ + Using compiler-based depend." 1>&2 +ifeq ($(GNU_CC)$(GNU_CXX),) +# Non-GNU compilers + @echo "`echo '$(MAKE):'|sed 's/./ /g'`"\ + '(Compiler-based depend was turned on by "--enable-depend".)' 1>&2 +else +# GNU compilers + @space="`echo '$(MAKE): '|sed 's/./ /g'`";\ + echo "$$space"'Since you are using a GNU compiler,\ + it is on by default.' 1>&2; \ + echo "$$space"'To turn it off, pass --disable-md to configure.' 1>&2 +endif else $(MKDEPENDENCIES):: touch $(MKDEPENDENCIES)