summaryrefslogtreecommitdiff
path: root/solenv/inc/rules.mk
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2002-03-26 17:15:34 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2002-03-26 17:15:34 +0000
commit1bb24b755e4dfb4c0048c11401da391795d9c58e (patch)
tree8e58f41a4b24280119ad2246a81c475664902933 /solenv/inc/rules.mk
parent5310f8dea2810e3c08b77dd11babb948561f677a (diff)
treat non 4nt shells the same way
Diffstat (limited to 'solenv/inc/rules.mk')
-rw-r--r--solenv/inc/rules.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 33b0335935bc..4367f5def3a3 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: rules.mk,v $
#
-# $Revision: 1.41 $
+# $Revision: 1.42 $
#
-# last change: $Author: hjs $ $Date: 2002-03-14 12:41:18 $
+# last change: $Author: hjs $ $Date: 2002-03-26 18:15:34 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -387,7 +387,7 @@ $(MISC)$/s_%.dpcc : $(MISCX)$/%.c
@echo ------------------------------ $(noout)
@echo Making: $@ $(noout)
@+-$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
.ELSE # "$(GUI)"=="UNX"
@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
@@ -402,7 +402,7 @@ $(MISC)$/o_%.dpcc : $(MISCX)$/%.c
@echo ------------------------------ $(noout)
@echo Making: $@ $(noout)
@+-$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
.ELSE # "$(GUI)"=="UNX"
@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
@@ -417,7 +417,7 @@ $(MISC)$/s_%.dpcc : $(MISCX)$/%.cxx
@echo ------------------------------ $(noout)
@echo Making: $@ $(noout)
@+-$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
.ELSE # "$(GUI)"=="UNX"
@$(MAKEDEPEND) -f - -p$(SLO)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
@@ -432,7 +432,7 @@ $(MISC)$/o_%.dpcc : $(MISCX)$/%.cxx
@echo ------------------------------ $(noout)
@echo Making: $@ $(noout)
@+-$(RM) $@ >& $(NULLDEV)
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)$/\#\# > $@
.ELSE # "$(GUI)"=="UNX"
@$(MAKEDEPEND) -f - -p$(OBJ)$/ $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@