From 55258087a25b4bc05ffdf8069320bb5ff4be0487 Mon Sep 17 00:00:00 2001 From: "slamm%netscape.com" Date: Tue, 14 Mar 2000 17:55:03 +0000 Subject: [PATCH] Remove dist directory on 'clean' target. Otherwise, tinderbox never removes dist and thinks it has a complete binary when it does not. Maybe we should change the tinderbox scripts instead of doing this, but this will get tinderbox turning red now. git-svn-id: svn://10.0.0.236/trunk@62944 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/Makefile.in | 3 ++- mozilla/config/config.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 2009d9068af..b58ec09e5a2 100644 --- a/mozilla/Makefile.in +++ b/mozilla/Makefile.in @@ -124,7 +124,8 @@ ifdef ENABLE_TESTS DIRS += xpcom/tests endif -DIST_GARBAGE := dist config.cache config.log config.status config-defs.h \ +GARBAGE += dist +DIST_GARBAGE := config.cache config.log config.status config-defs.h \ dependencies.beos config/autoconf.mk \ $(shell cd $(topsrcdir); . ./allmakefiles.sh; \ echo $${MAKEFILES}) diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 0e16949a176..cb409097b03 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -168,7 +168,7 @@ MY_RULES := $(DEPTH)/config/myrules.mk # Relative pathname from top-of-tree to current source directory # ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) -REVDEPTH := $(CONFIG_TOOLS)/revdepth +REVDEPTH = $(CONFIG_TOOLS)/revdepth endif # @@ -399,7 +399,7 @@ endif ###################################################################### -GARBAGE = $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB +GARBAGE += $(DEPENDENCIES) $(MKDEPENDENCIES) $(MKDEPENDENCIES).bak core $(wildcard core.[0-9]*) $(wildcard *.err) $(wildcard *.pure) $(wildcard *_pure_*.o) Templates.DB ifneq ($(OS_ARCH),WINNT) NSINSTALL = $(CONFIG_TOOLS)/nsinstall