diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:11:06 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:11:06 +0000 |
commit | 43b2dd92a63f1f0675a41a13a2d1f814134ecef9 (patch) | |
tree | b964d762909b9cc27e68286acac8b43e34d52ebf /dmake/startup | |
parent | 0d90a0ce6af5e2ba146c08c5a73d846f609e3022 (diff) |
INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED
2005/04/09 21:41:13 vq 1.1.1.1.132.1: Issue number: 43254
Submitted by: shay@openoffice.org
Don't import OS, OSRELEASE and OSENVIRONMENT from environment in startup.mk.
Diffstat (limited to 'dmake/startup')
-rw-r--r-- | dmake/startup/startup.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dmake/startup/startup.mk b/dmake/startup/startup.mk index 7e8b4aec9231..524ad1efba26 100644 --- a/dmake/startup/startup.mk +++ b/dmake/startup/startup.mk @@ -24,7 +24,9 @@ __.DEFAULTS !:= yes # yes => define default construction rules. __.EXECS !:= yes # yes => define how to build executables. # Grab key definitions from the environment -.IMPORT .IGNORE : OS OSRELEASE OSENVIRONMENT TMPDIR SHELL +# The variables OS OSRELEASE OSENVIRONMENT were removed from this +# list because of windows. See issue 43254 for details. +.IMPORT .IGNORE : TMPDIR SHELL # Default DMAKE configuration, if not overriden by environment .INCLUDE .NOINFER $(!null,$(OS) .IGNORE) : $(INCFILENAME:d)config.mk |