summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-04-20 11:18:58 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-04-20 11:18:58 +0000
commit9fbdfb64822b9365e8e0336c271ff7b27cc84fc0 (patch)
tree470316e35040098ec8944abcd08ca8c30805b9a8
parent4731a9e745f40927b76770b9c2ce61d617a12b7d (diff)
INTEGRATION: CWS dmake43p01 (1.4.6); FILE MERGED
2005/04/09 21:22:35 vq 1.4.6.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/unix/ruletab.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/dmake/unix/ruletab.c b/dmake/unix/ruletab.c
index 288fa182a2ed..0677344e922b 100644
--- a/dmake/unix/ruletab.c
+++ b/dmake/unix/ruletab.c
@@ -1,6 +1,6 @@
/* $RCSfile: ruletab.c,v $
--- $Revision: 1.4 $
--- last change: $Author: rt $ $Date: 2004-09-08 16:09:26 $
+-- $Revision: 1.5 $
+-- last change: $Author: hr $ $Date: 2006-04-20 12:18:58 $
--
-- SYNOPSIS
-- Default initial configuration of dmake.
@@ -35,7 +35,7 @@ static char *_rules[] = {
"MAXPROCESSLIMIT := 10",
"MAXLINELENGTH := 8190",
#include "dmakeroot.h"
- ".IMPORT .IGNORE: DMAKEROOT SOLARVER UPD INPATH OS UPDMINOREXT",
+ ".IMPORT .IGNORE: DMAKEROOT",
".MAKEFILES : makefile.mk Makefile makefile",
".SOURCE : .NULL",
#include "startup.h"