diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:09:40 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:09:40 +0000 |
| commit | d51fea043248602f90343eaec5ec03863a04a68a (patch) | |
| tree | 3501d5069544ee6c232f4fd50dfe1666661a2b32 /dmake/qssl | |
| parent | f2a92d3ce7402123491b65088b75d4e6de9d0c48 (diff) | |
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.
Diffstat (limited to 'dmake/qssl')
| -rw-r--r-- | dmake/qssl/ruletab.c | 4 | ||||
| -rw-r--r-- | dmake/qssl/startup.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/dmake/qssl/ruletab.c b/dmake/qssl/ruletab.c index 4bdd0be36314..cbfd285f3d71 100644 --- a/dmake/qssl/ruletab.c +++ b/dmake/qssl/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: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" diff --git a/dmake/qssl/startup.h b/dmake/qssl/startup.h index 051ed555774d..139fc1e3e136 100644 --- a/dmake/qssl/startup.h +++ b/dmake/qssl/startup.h @@ -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", |