summaryrefslogtreecommitdiff
path: root/solenv/inc/startup
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-07-05 21:06:10 +0000
committerKurt Zenker <kz@openoffice.org>2006-07-05 21:06:10 +0000
commitb25e76d7cf27aa0f548a19ce6528eadcaf1fac15 (patch)
treea28fa7904824740b4235c6d32d00ee992bd176da /solenv/inc/startup
parent3cc872a33bb39027bff1555c10d795f532f8fb2f (diff)
INTEGRATION: CWS ause058 (1.2.498); FILE MERGED
2006/06/22 13:17:40 hjs 1.2.498.2: #i58890# applied iz58890_3.diff 2006/06/16 11:38:09 hjs 1.2.498.1: #i58351# more bash
Diffstat (limited to 'solenv/inc/startup')
-rw-r--r--solenv/inc/startup/UNIX/macros.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/solenv/inc/startup/UNIX/macros.mk b/solenv/inc/startup/UNIX/macros.mk
index 46c8fe89b31c..2b556b500712 100644
--- a/solenv/inc/startup/UNIX/macros.mk
+++ b/solenv/inc/startup/UNIX/macros.mk
@@ -2,10 +2,14 @@
#
SHELL *:= /usr/bin/csh
-SHELLFLAGS *:=
GROUPSHELL *:= $(SHELL)
- SHELLFLAGS := -fc
+.IF $(USE_SHELL) == bash
+ SHELLFLAGS *:= -c
+.ELSE
+ SHELLFLAGS *:= -fc
+.ENDIF # $(USE_SHELL) == bash
+
GROUPFLAGS *:= $(SHELLFLAGS)
SHELLMETAS *:= "<>|/
RM *= rm