diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-11-29 18:50:33 +0100 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-11-29 18:50:33 +0100 |
commit | 9f4aa7a75700180058473a7f68fc393872e25b02 (patch) | |
tree | 015e2a7d555da3fc0ba8ad8c89688a324ed13439 /desktop/test | |
parent | CWS-TOOLING: integrate CWS fwk149 (diff) | |
download | core-9f4aa7a75700180058473a7f68fc393872e25b02.tar.gz core-9f4aa7a75700180058473a7f68fc393872e25b02.zip |
ause128: #i115689# guard additional dependencies of ZIPnTARGETN
Diffstat (limited to 'desktop/test')
-rw-r--r-- | desktop/test/deployment/locationtest/makefile.mk | 3 | ||||
-rwxr-xr-x | desktop/test/deployment/update/updateinfocreation/build/makefile.mk | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/desktop/test/deployment/locationtest/makefile.mk b/desktop/test/deployment/locationtest/makefile.mk index 8fe189791961..24be56c28d7e 100644 --- a/desktop/test/deployment/locationtest/makefile.mk +++ b/desktop/test/deployment/locationtest/makefile.mk @@ -80,5 +80,8 @@ $(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).cr $(COPY) description.xml $(MISC)$/$(TARGET)$/description.xml $(TOUCH) $@ +.IF "$(ZIP1TARGETN)"!="" $(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir +.ENDIF # "$(ZIP1TARGETN)"!="" + diff --git a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk index 6af3928279e0..b0479c942b4f 100755 --- a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk +++ b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk @@ -84,5 +84,8 @@ $(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).cr $(GNUCOPY) -u description.xml $(MISC)$/$(TARGET)$/description.xml $(TOUCH) $@ +.IF "$(ZIP1TARGETN)"!="" $(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir +.ENDIF # "$(ZIP1TARGETN)"!="" + |