From c3a3a8f24fcdaf76151f65f46d07565b51737a61 Mon Sep 17 00:00:00 2001 From: "leaf%mozilla.org" Date: Tue, 26 Mar 2002 22:17:58 +0000 Subject: [PATCH] fix official gmake on windows builds; use check for null value instead of gmake's origin function, so local makefiles can unset OFFICIAL vars for versioning purposes. r= aki, cls --- config/mkdepend/Makefile.in | 7 +++++-- config/version.mk | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/mkdepend/Makefile.in b/config/mkdepend/Makefile.in index 0e0e0d852052..5b97c770ad9a 100644 --- a/config/mkdepend/Makefile.in +++ b/config/mkdepend/Makefile.in @@ -26,8 +26,11 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = mkdepend -PROGRAM = mkdepend$(BIN_SUFFIX) +# undefine (as best we can, thanks gmake!) so we don't need build_number +MOZILLA_OFFICIAL = +BUILD_OFFICIAL = +MODULE = mkdepend +PROGRAM = mkdepend$(BIN_SUFFIX) ifdef GNU_CC MODULE_OPTIMIZE_FLAGS = -O3 else diff --git a/config/version.mk b/config/version.mk index 6963a4a05db5..76a885b0f06d 100644 --- a/config/version.mk +++ b/config/version.mk @@ -51,7 +51,7 @@ ifndef RESFILE RCFILE=./module.rc RESFILE=./module.res _RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(topsrcdir) -BITS $(MOZ_BITS) -OBJDIR . -SRCDIR $(srcdir) -ifneq ($(origin BUILD_OFFICIAL)_$(origin MOZILLA_OFFICIAL),undefined_undefined) +ifneq ($(BUILD_OFFICIAL)_$(MOZILLA_OFFICIAL),_) _RC_STRING += -OFFICIAL 1 endif ifdef MOZ_DEBUG