diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:18:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:18:14 +0000 |
| commit | b0f1a4017e928720707ecc46a15063c4525fdc40 (patch) | |
| tree | 95e3837ff3aa4ee0b4e5a8d4d62c3cbfdce3e687 /dmake/tos | |
| parent | 9707a9229d119131880612426c7a3c822fbb4838 (diff) | |
INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED
2005/04/09 21:22:34 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/tos')
| -rw-r--r-- | dmake/tos/ruletab.c | 4 | ||||
| -rw-r--r-- | dmake/tos/startup.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/dmake/tos/ruletab.c b/dmake/tos/ruletab.c index 4e70c19621d4..2631131a8d7a 100644 --- a/dmake/tos/ruletab.c +++ b/dmake/tos/ruletab.c @@ -1,4 +1,4 @@ -/* RCS $Id: ruletab.c,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $ +/* RCS $Id: ruletab.c,v 1.2 2006-04-20 12:18:01 hr Exp $ -- -- SYNOPSIS -- Default initial configuration of dmake. @@ -33,7 +33,7 @@ static char *_rules[] = { "MAXPROCESSLIMIT := 1", "MAXPROCESS := 1", "MAXLINELENGTH := 8190", - ".IMPORT .IGNORE: ROOTDIR", + ".IMPORT .IGNORE: ROOTDIR DMAKEROOT", ".MAKEFILES : makefile.mk Makefile makefile", ".SOURCE : .NULL", #include "startup.h" diff --git a/dmake/tos/startup.h b/dmake/tos/startup.h index 216f463ded56..30a91342c718 100644 --- a/dmake/tos/startup.h +++ b/dmake/tos/startup.h @@ -1,4 +1,4 @@ -/* RCS $Id: startup.h,v 1.1.1.1 2000-09-22 15:33:33 hr Exp $ +/* RCS $Id: startup.h,v 1.2 2006-04-20 12:18:14 hr Exp $ -- -- SYNOPSIS -- Definition of MAKESTARTUP @@ -24,4 +24,5 @@ -- Use cvs log to obtain detailed change logs. */ -"MAKESTARTUP := $(ROOTDIR)/etc/startup/startup.mk", +"DMAKEROOT *:= $(ROOTDIR)/etc/startup", +"MAKESTARTUP := $(DMAKEROOT)/startup.mk", |