strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED

Browse source 
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.
This commit is contained in:
Jens-Heiner Rechtien 2006-04-20 11:11:06 +00:00
parent 0d90a0ce6a
commit 43b2dd92a6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dmake/startup/startup.mk
View file

@ -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