summaryrefslogtreecommitdiff
path: root/desktop/test/deployment/locationtest
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-07-05 08:26:28 +0000
committerRüdiger Timm <rt@openoffice.org>2007-07-05 08:26:28 +0000
commite8aabeca7d9f44f87bcfd9fbef9890be6dacc39a (patch)
tree44c1242f4699197544118b789f56590571e8517c /desktop/test/deployment/locationtest
parentdb5c681b139bb1139d1099dcfc055cbf43c983b5 (diff)
INTEGRATION: CWS aquavcl01 (1.3.22); FILE MERGED
2007/06/25 16:24:33 ericb 1.3.22.1: #i78528# workaround for build breaker in desktop, the time cloph provides a better fix
Diffstat (limited to 'desktop/test/deployment/locationtest')
-rw-r--r--desktop/test/deployment/locationtest/makefile.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/desktop/test/deployment/locationtest/makefile.mk b/desktop/test/deployment/locationtest/makefile.mk
index 940e1b37a402..dc7576a4ba8c 100644
--- a/desktop/test/deployment/locationtest/makefile.mk
+++ b/desktop/test/deployment/locationtest/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: rt $ $Date: 2007-06-14 10:26:58 $
+# last change: $Author: rt $ $Date: 2007-07-05 09:26:28 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -82,10 +82,10 @@ $(MISC)$/$(ZIP1TARGET).createdir :
+$(MKDIRHIER) $(MISC)$/$(TARGET)$/META-INF >& $(NULLDEV) && $(TOUCH) $@
$(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).createdir $(BIN)$/LocationTest.rdb description.xml
- $(GNUCOPY) -u manifest.xml $(MISC)$/$(TARGET)$/META-INF$/manifest.xml
- $(GNUCOPY) -u $(JARTARGETN) $(MISC)$/$(TARGET)$/$(JARTARGET)
- $(GNUCOPY) -u $(BIN)$/LocationTest.rdb $(MISC)$/$(TARGET)$/LocationTest.rdb
- $(GNUCOPY) -u description.xml $(MISC)$/$(TARGET)$/description.xml
+ $(COPY) manifest.xml $(MISC)$/$(TARGET)$/META-INF$/manifest.xml
+ $(COPY) $(JARTARGETN) $(MISC)$/$(TARGET)$/$(JARTARGET)
+ $(COPY) $(BIN)$/LocationTest.rdb $(MISC)$/$(TARGET)$/LocationTest.rdb
+ $(COPY) description.xml $(MISC)$/$(TARGET)$/description.xml
$(TOUCH) $@
$(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir