diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:08:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:08:38 +0000 |
| commit | a092f4cf02f646759fac83f6e7c313b5d6e3f34c (patch) | |
| tree | e8698a31786a63967bd474d7b739e2057a4fdf9d | |
| parent | INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED (diff) | |
| download | core-a092f4cf02f646759fac83f6e7c313b5d6e3f34c.tar.gz core-a092f4cf02f646759fac83f6e7c313b5d6e3f34c.zip | |
INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED
2005/04/09 21:22:31 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.
| -rw-r--r-- | dmake/msdos/startup.h | 4 | ||||
| -rw-r--r-- | dmake/os2/ruletab.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dmake/msdos/startup.h b/dmake/msdos/startup.h index 22eeb863e809..660285c4b19b 100644 --- a/dmake/msdos/startup.h +++ b/dmake/msdos/startup.h @@ -1,4 +1,4 @@ -/* RCS $Id: startup.h,v 1.1.1.1 2000-09-22 15:33:27 hr Exp $ +/* RCS $Id: startup.h,v 1.2 2006-04-20 12:06:36 hr Exp $ -- -- SYNOPSIS -- Dmake startup header file definition. @@ -23,4 +23,4 @@ -- Use cvs log to obtain detailed change logs. */ -"MAKESTARTUP := $(MAKECMD:d)startup/startup.mk", +"MAKESTARTUP := $(DMAKEROOT)\\startup.mk", diff --git a/dmake/os2/ruletab.c b/dmake/os2/ruletab.c index 8620556393de..97204272db36 100644 --- a/dmake/os2/ruletab.c +++ b/dmake/os2/ruletab.c @@ -1,4 +1,4 @@ -/* RCS $Id: ruletab.c,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $ +/* RCS $Id: ruletab.c,v 1.2 2006-04-20 12:08:38 hr Exp $ -- -- SYNOPSIS -- Default initial configuration of dmake. @@ -36,7 +36,7 @@ static char *_rules[] = { "MAXLINELENGTH := 2046", "MAXPROCESSLIMIT := 16", - ".IMPORT .IGNORE: DMAKEROOT SOLARVER UPD INPATH OS UPDMINOREXT" + ".IMPORT .IGNORE: DMAKEROOT" ".MAKEFILES : makefile.mk Makefile", ".SOURCE : .NULL", #include "startup.h" |