diff options
| author | wtc%netscape.com <devnull@localhost> | 1999-04-15 03:04:29 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1999-04-15 03:04:29 +0000 |
| commit | 9aa43c420742a176b5d271eb01f01c5fc309f83f (patch) | |
| tree | 5f247f0fe911893ba3961218412d2d39bc8bd0a7 | |
| parent | 770b2d34611327146490a98aac41856dfb86268e (diff) | |
| download | nspr-hg-9aa43c420742a176b5d271eb01f01c5fc309f83f.tar.gz | |
Bugzilla bug #5111: include my_config.mk and my_overrides.mk, if they
exist, to allow for user config and overrides of NSPR build variables.
Thanks to Ramiro Estrugo <ramiro@netscape.com> for the design and
implementation.
Modified files: .cvsignore, config.mk.
| -rw-r--r-- | config/.cvsignore | 2 | ||||
| -rw-r--r-- | config/config.mk | 32 |
2 files changed, 34 insertions, 0 deletions
diff --git a/config/.cvsignore b/config/.cvsignore index d5c467b9..e6e162a9 100644 --- a/config/.cvsignore +++ b/config/.cvsignore @@ -1,2 +1,4 @@ nfspwd revdepth +my_config.mk +my_overrides.mk diff --git a/config/config.mk b/config/config.mk index 10f9e920..17e53042 100644 --- a/config/config.mk +++ b/config/config.mk @@ -21,6 +21,36 @@ # Define an include-at-most-once-flag NSPR_CONFIG_MK = 1 +# +# The variable definitions in this file are inputs to NSPR's +# build system. This file, if present, is included at the +# beginning of config.mk. +# +# For example: +# +# BUILD_OPT=1 +# USE_PTHREADS=1 +# NS_USE_GCC= +# +ifndef NSPR_MY_CONFIG_MK +NSPR_MY_CONFIG_MK = $(MOD_DEPTH)/config/my_config.mk +endif + +# +# The variable definitions in this file are used to +# override variable values set by NSPR's build system. +# This file, if present, is included at the end of config.mk. +# +# For example: +# +# DIST=/usr/local/nspr +# +ifndef NSPR_MY_OVERRIDES_MK +NSPR_MY_OVERRIDES_MK = $(MOD_DEPTH)/config/my_overrides.mk +endif + +-include $(NSPR_MY_CONFIG_MK) + include $(MOD_DEPTH)/config/module.df include $(MOD_DEPTH)/config/arch.mk @@ -113,3 +143,5 @@ RELEASE_DIR = $(NSDEPTH)/dist/release/$(MOD_NAME) RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib + +-include $(NSPR_MY_OVERRIDES_MK) |