diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:25:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:25:19 +0000 |
| commit | 4537b08cacf279bf508895bf0e6e33649134079d (patch) | |
| tree | b7a2b48260804f47b5c6d14de46d0cd337d8618d /dmake/winnt | |
| parent | 764a276ed1fc8c3639ec6a3723fa180de862f5a2 (diff) | |
INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED
2005/04/11 03:28:55 vq 1.1.1.1.132.2: #i43252# Introduce the macro ABSMAKECMD that's value for a native Windows
dmake executable (compiled with MS Visual C++ or MinGW) is the absolute
filename and NULL for other operating systems or dmake build with other
compilers.
If DMAKEROOT is not changed and only for native Windows dmake versions the
value of DMAKEROOT now defaults to "$(ABSMAKECMD:d)startup".
2005/04/09 21:22:36 vq 1.1.1.1.132.1: #i43254# Make the usage of DMAKEROOT consistent with the man page for
all OSs. This includes the removal of "SOLARVER UPD INPATH OS UPDMINOREXT"
from the list of macros that are always imported from the environment.
Patch inspired in part by shay@openoffice.org.
Diffstat (limited to 'dmake/winnt')
| -rw-r--r-- | dmake/winnt/startup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dmake/winnt/startup.h b/dmake/winnt/startup.h index d1bfdb5688e4..18f48cfd9bde 100644 --- a/dmake/winnt/startup.h +++ b/dmake/winnt/startup.h @@ -1,4 +1,4 @@ -/* RCS $Id: startup.h,v 1.1.1.1 2000-09-22 15:33:37 hr Exp $ +/* RCS $Id: startup.h,v 1.2 2006-04-20 12:25:19 hr Exp $ -- -- SYNOPSIS -- Definition of MAKESTARTUP @@ -24,6 +24,6 @@ -- Use cvs log to obtain detailed change logs. */ -/*"MAKESTARTUP := $(MAKECMD:d)startup/startup.mk",*/ +"DMAKEROOT *= $(ABSMAKECMD:d)startup", "MAKESTARTUP := $(DMAKEROOT)\\startup.mk", |