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.

dmake/tos/ruletab.c

-/* 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"

dmake/tos/startup.h

-/* 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",