summaryrefslogtreecommitdiff
path: root/odk/util/odk_rules.pmk
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-03-05 15:40:20 +0000
committerKurt Zenker <kz@openoffice.org>2008-03-05 15:40:20 +0000
commit6ddeb3681bab3dbbe00673559f06998a8344927b (patch)
tree2bfbf571ee59b0e57d6f8d9730d969b3ef992896 /odk/util/odk_rules.pmk
parent361ba7117de014bbe99e947c1cdfc987c1a64723 (diff)
INTEGRATION: CWS nowrapcmd2 (1.27.10); FILE MERGED
2008/02/29 19:19:11 vq 1.27.10.1: #i86498# Fix W32-4nt build problem.
Diffstat (limited to 'odk/util/odk_rules.pmk')
-rw-r--r--odk/util/odk_rules.pmk10
1 files changed, 4 insertions, 6 deletions
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk
index d4b2919b11c1..b450841bfa8d 100644
--- a/odk/util/odk_rules.pmk
+++ b/odk/util/odk_rules.pmk
@@ -2,9 +2,9 @@
#
# $RCSfile: odk_rules.pmk,v $
#
-# $Revision: 1.27 $
+# $Revision: 1.28 $
#
-# last change: $Author: ihi $ $Date: 2008-01-16 14:23:55 $
+# last change: $Author: kz $ $Date: 2008-03-05 16:40:20 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -177,12 +177,10 @@ $(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a
$(DIR_CREATE_FLAG) :
.IF "$(USE_SHELL)" != "4nt"
$(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 20 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@
- sleep 2
.ELSE
- $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | tr "\\" "/" | xargs mkdir.exe -p && echo "dirs created" > $@ && touch $@
-# keep forced shell as delay is a 4nt internal command
- +delay 2
+ $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST:s#\#/#)) | $(XARGS) $(MKDIRHIER) && echo "dirs created" > $@ && touch $@
.ENDIF
+ $(DELAY) 2
$(DESTDIRSETTINGS)$/component.uno.def : $(PRJ)$/settings$/component.uno.def
@@-rm -f $@