diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 10:48:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-27 10:48:49 +0000 |
| commit | eb62b06be2da4592da0bedf2e8814bcf0f691905 (patch) | |
| tree | b02b60f60a84ca5c59eba60995ecee2bd49dfff4 /solenv/inc/startup | |
| parent | b57fee8153ab7bb8a2fdc2a12a5ccc0c0927d6f4 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'solenv/inc/startup')
| -rw-r--r-- | solenv/inc/startup/FREEBSD/macros.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/startup/startup.mk | 5 | ||||
| -rw-r--r-- | solenv/inc/startup/wnt/macros.mk | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/solenv/inc/startup/FREEBSD/macros.mk b/solenv/inc/startup/FREEBSD/macros.mk deleted file mode 100644 index 5387b1940198..000000000000 --- a/solenv/inc/startup/FREEBSD/macros.mk +++ /dev/null @@ -1,2 +0,0 @@ - -.INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d:d:d)UNIX$/macros.mk diff --git a/solenv/inc/startup/startup.mk b/solenv/inc/startup/startup.mk index 09ce546307ca..85b6b829449e 100644 --- a/solenv/inc/startup/startup.mk +++ b/solenv/inc/startup/startup.mk @@ -17,7 +17,6 @@ __.silent !:= $(.SILENT) # Preserve user's .SILENT flag .SILENT !:= yes .NOTABS !:= yes .ERROR : - @+echo found ERROR @echo ---* $(MKFILENAME) *--- # Define the directory separator string. @@ -100,7 +99,7 @@ MAXLINELENGTH = 65530 RMTARGET *= $< # Default recipe that is used to remove intermediate targets. -.REMOVE :; +-echo dummy remove #$(RM) $(RMFLAGS) $(RMTARGET) +.REMOVE :; #+-echo dummy remove #$(RM) $(RMFLAGS) $(RMTARGET) #.REMOVE :; echo $(RM) $(RMFLAGS) $(RMTARGET) dummy_mh: @@ -146,7 +145,7 @@ NULLPRQ *:= __.NULLPRQ # Standard C-language command names and flags CPP *:= $/lib$/cpp # C-preprocessor - CC *:= cc # C compiler +# CC *:= cc # C compiler CFLAGS *= # C compiler flags "C++" *:= CC # C++ Compiler "C++FLAGS" *= # C++ Compiler flags diff --git a/solenv/inc/startup/wnt/macros.mk b/solenv/inc/startup/wnt/macros.mk index 1a7a4fc61567..1a59318d509f 100644 --- a/solenv/inc/startup/wnt/macros.mk +++ b/solenv/inc/startup/wnt/macros.mk @@ -42,7 +42,7 @@ V *:= # RCS suffix # DIVFILE *= $(TMPFILE:s,/,\) RM *= del # RM *= +-del - RMFLAGS *= /y /E + RMFLAGS *= /y MV *= rename __.DIVSEP-sh-yes *:= \\ __.DIVSEP-sh-no *:= \\ @@ -66,6 +66,10 @@ V *:= # RCS suffix __.DIVSEP-sh-yes *:= \\\ __.DIVSEP-sh-no *:= \\ DIRSEPSTR :=/ +# See IZ 11093 why PWD has to be overwritten + PWD:=$(shell +pwd) +.EXPORT : PWD + .ENDIF |