summaryrefslogtreecommitdiff
path: root/helpcontent2/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-01-25 14:32:14 +0000
committerOliver Bolte <obo@openoffice.org>2007-01-25 14:32:14 +0000
commit86b32ed1bab1665a7b668f64862659e9fe59eaef (patch)
tree50ee226d58f899e28fc6a36b0cd518a83975ab78 /helpcontent2/source
parent015d2f849f537ec619bf39c9748c924c5c2b2e8f (diff)
INTEGRATION: CWS ause069 (1.10.10); FILE MERGED
2006/12/04 22:35:06 hjs 1.10.10.2: RESYNC: (1.10-1.11); FILE MERGED 2006/10/18 17:11:01 hjs 1.10.10.1: #i70359# remove forced shell calls
Diffstat (limited to 'helpcontent2/source')
-rw-r--r--helpcontent2/source/auxiliary/makefile.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk
index 56fddc9f5..e5e96b3d8 100644
--- a/helpcontent2/source/auxiliary/makefile.mk
+++ b/helpcontent2/source/auxiliary/makefile.mk
@@ -3,9 +3,9 @@
#* $Workfile:$
#*
#* Creation date KR 28.06.99
-#* last change $Author: kz $ $Date: 2006-11-08 11:53:48 $
+#* last change $Author: obo $ $Date: 2007-01-25 15:32:14 $
#*
-#* $Revision: 1.11 $
+#* $Revision: 1.12 $
#*
#* $Logfile:$
#*
@@ -38,9 +38,9 @@ ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst
.IF "$(WITH_LANG)"!=""
.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-t_aux_langdirs:=$(shell +find ./ -name "*.cfg" | sed "s/\.\/\///" | sed "s/\.\///" )
+t_aux_langdirs:=$(shell find ./ -name "*.cfg" | sed "s/\.\/\///" | sed "s/\.\///" )
.ELSE # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-t_aux_langdirs:=$(subst,./, $(shell +$(FIND) ./ -name "*.cfg"))
+t_aux_langdirs:=$(subst,./, $(shell $(FIND) ./ -name "*.cfg"))
.ENDIF # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
aux_langdirs:=$(uniq $(t_aux_langdirs:d:d))
@@ -58,13 +58,13 @@ LOCTREEFILES:=$(foreach,j,$(TREEFILES) $(COMMONMISC)$/en-US$/$j)
.ENDIF #IF "$(WITH_LANG)"!=""
$(COMMONMISC)$/treefiles.done : $(LOCTREEFILES)
- @+$(PERL) $(PRJ)$/helpers$/update_tree.pl && $(TOUCH) $@
+ @$(PERL) $(PRJ)$/helpers$/update_tree.pl && $(TOUCH) $@
%.created:
- @+-$(MKDIRHIER) $(@:d) && $(TOUCH) $@
+ @-$(MKDIRHIER) $(@:d) && $(TOUCH) $@
$(LOCTREEFILES) : $(TREEFILES) $$(@:d)$/dir.created
- @+$(TOUCH) $@
+ @$(TOUCH) $@
.IF "$(WITH_LANG)"!=""
$(LOCTREEFILES) : $(PRJ)$/source$/text$/shared$/localize.sdf
@@ -74,8 +74,8 @@ aux_dirs .PHONY :
echo aux_langdirs:=$(aux_langdirs) > $(INCCOM)$/aux_langs.mk
$(COMMONBIN)$/helpimg.ilst .PHONY:
- +-$(RM) $@
+ -$(RM) $@
$(PERL) $(PRJ)$/helpers$/create_ilst.pl -dir=$(SOLARSRC)/default_images/res/helpimg > $@.$(INPATH)
- +$(RENAME) $@.$(INPATH) $@
+ $(RENAME) $@.$(INPATH) $@