summaryrefslogtreecommitdiff
path: root/solenv/inc/startup/OS2/macros.mk
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2010-05-10 16:03:24 +0200
committerKurt Zenker <kz@openoffice.org>2010-05-10 16:03:24 +0200
commit0cb52efc47c042c28b5c8e1d9bd1d9fb60ef52df (patch)
tree65bad421412568d6926ce285ab5786238b01ef30 /solenv/inc/startup/OS2/macros.mk
parent1f8d19b79c14ccd081f5c60dc0f6f89bb6c1ffea (diff)
parent35170adf00ca910e1c1df1df540933e2b9e8fa39 (diff)
merge to m77
Diffstat (limited to 'solenv/inc/startup/OS2/macros.mk')
-rw-r--r--solenv/inc/startup/OS2/macros.mk55
1 files changed, 6 insertions, 49 deletions
diff --git a/solenv/inc/startup/OS2/macros.mk b/solenv/inc/startup/OS2/macros.mk
index 08d2be3f9a48..2f1447e6e714 100644
--- a/solenv/inc/startup/OS2/macros.mk
+++ b/solenv/inc/startup/OS2/macros.mk
@@ -4,22 +4,6 @@
# Process release-specific refinements, if any.
# YD .INCLUDE .NOINFER .IGNORE : $(INCFILENAME:d)$(OSRELEASE)$/macros.mk
-# Execution environment configuration.
-# Grab the current setting of COMSPEC.
-#
-.IMPORT .IGNORE : COMSPEC
-
-# First check if SHELL is defined to be something other than COMSPEC.
-# If it is assume that SHELL is a Korn compatible shell like MKS's
-.IF $(SHELL) == $(NULL)
- .IF $(COMSPEC) == $(NULL)
- SHELL *:= $(ROOTDIR)$/bin$/sh$E
- .ELSE
- SHELL *:= $(COMSPEC)
- .END
-.END
-GROUPSHELL *:= $(SHELL)
-
# Directory entries are case incensitive
.DIRCACHERESPCASE *:= no
@@ -35,39 +19,12 @@ P *:= .pas # Pascal
S *:= .asm # Assembler sources
V *:= # RCS suffix
-# Now set the remaining arguments depending on which SHELL we
-# are going to use. COMSPEC (assumed to be command.com) or
-# MKS Korn shell.
-.IF $(SHELL) == $(COMSPEC)
- SHELLFLAGS *:= $(SWITCHAR)c
- GROUPFLAGS *:= $(SHELLFLAGS)
- SHELLMETAS *:= <>|*?&
- GROUPSUFFIX *:= .bat
- DIVFILE *= $(TMPFILE:s,/,\\,)
- RM *= rm
- RMFLAGS *= -f
- MV *= rename
- __.DIVSEP-sh-yes *:= \\
- __.DIVSEP-sh-no *:= \\
- DIRSEPSTR := \\
-# See iz61212 for the reason why PWD is overwritten
-# PWD:=$(shell +echo %_cwd:s,/,\\,)
-# PWD:=$(shell +cd)
-#.EXPORT : PWD
-
-.ELSE
- SHELLFLAGS *:= -c
- GROUPFLAGS *:=
- SHELLMETAS *:= *"?<>|()&][$$\#`'
- GROUPSUFFIX *:= .ksh
- .MKSARGS *:= yes
- RM *= $(ROOTDIR)$/bin$/rm
- RMFLAGS *= -f
- MV *= $(ROOTDIR)$/bin$/mv
- DIVFILE *= $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
- __.DIVSEP-sh-yes !:= \\\
- __.DIVSEP-sh-no !:= \\
-.ENDIF
+.MKSARGS *:= yes
+RM *= $(ROOTDIR)$/bin$/rm
+MV *= $(ROOTDIR)$/bin$/mv
+DIVFILE *= $(TMPFILE:s,/,${__.DIVSEP-sh-${USESHELL}})
+__.DIVSEP-sh-yes !:= \\\
+__.DIVSEP-sh-no !:= \\
NAMEMAX = 256