INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED

2005/04/09 21:22:32 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.
This commit is contained in:
Jens-Heiner Rechtien 2006-04-20 11:09:40 +00:00
parent f2a92d3ce7
commit d51fea0432
2 changed files with 5 additions and 4 deletions

View file

@ -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:09:28 hr Exp $
--
-- SYNOPSIS
-- Default initial configuration of dmake.
@ -32,7 +32,7 @@
static char *_rules[] = {
"MAXPROCESSLIMIT := 10",
"MAXLINELENGTH := 8190",
".IMPORT .IGNORE: ROOTDIR",
".IMPORT .IGNORE: ROOTDIR DMAKEROOT",
".MAKEFILES : makefile.mk Makefile makefile",
".SOURCE : .NULL",
#include "startup.h"

View file

@ -1,4 +1,4 @@
/* RCS $Id: startup.h,v 1.1.1.1 2000-09-22 15:33:30 hr Exp $
/* RCS $Id: startup.h,v 1.2 2006-04-20 12:09:40 hr Exp $
--
-- SYNOPSIS
-- Definition of MAKESTARTUP
@ -24,4 +24,5 @@
-- Use cvs log to obtain detailed change logs.
*/
"MAKESTARTUP := $(ROOTDIR)/usr/local/lib/dmake/startup/startup.mk",
"DMAKEROOT *:= $(ROOTDIR)/usr/local/lib/dmake/startup",
"MAKESTARTUP := $(DMAKEROOT)/startup.mk",