Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set MOZILLA_FIVE_HOME for run_apprunner and run_viewer targets. Change the message on the depend target when using compiler-based depend.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@25709 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
slamm%netscape.com
1999-03-31 19:07:29 +00:00
parent e7968b2d01
commit ebcd46ea01
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/config/rules.mk
View File

@@ -401,13 +401,13 @@ checkout:
run_viewer: $(DIST)/bin/viewer run_viewer: $(DIST)/bin/viewer
cd $(DIST)/bin; \ cd $(DIST)/bin; \
MOZILLA_FIVE_HOME= ; \ MOZILLA_FIVE_HOME=`pwd` \
LD_LIBRARY_PATH=".:$(LIBS_PATH):$$LD_LIBRARY_PATH" \ LD_LIBRARY_PATH=".:$(LIBS_PATH):$$LD_LIBRARY_PATH" \
viewer viewer
run_apprunner: $(DIST)/bin/apprunner run_apprunner: $(DIST)/bin/apprunner
cd $(DIST)/bin; \ cd $(DIST)/bin; \
MOZILLA_FIVE_HOME= ; \ MOZILLA_FIVE_HOME=`pwd` \
LD_LIBRARY_PATH=".:$(LIBS_PATH):$$LD_LIBRARY_PATH" \ LD_LIBRARY_PATH=".:$(LIBS_PATH):$$LD_LIBRARY_PATH" \
apprunner apprunner
@@ -958,7 +958,19 @@ endif
############################################################################# #############################################################################
ifdef COMPILER_DEPEND ifdef COMPILER_DEPEND
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 else
$(MKDEPENDENCIES):: $(MKDEPENDENCIES)::
touch $(MKDEPENDENCIES) touch $(MKDEPENDENCIES)