solenv/gbuild/Jar.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1e928fd948005664dbb32bc945808273e56b2ee6
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Sep 17 18:54:32 2011 -0400
don't try to cat a non existent Jar manifest
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 652331a..b30bd3a 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -50,7 +50,7 @@ define gb_Jar__command
echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) &&
\
echo "Class-Path: $(JARCLASSPATH)" >> $(call
gb_Jar_get_manifest_target,$(1)) && \
echo "Solar-Version: $(RSCREVISION)" >> $(call
gb_Jar_get_manifest_target,$(1)) && \
- cat $(MANIFEST) >> $(call gb_Jar_get_manifest_target,$(1)) && \
+ cat $(if $(MANIFEST),$(MANIFEST),$(gb_Helper_MISCDUMMY)) >> $(call
gb_Jar_get_manifest_target,$(1)) && \
mkdir -p $(dir $(2)) && \
cd $(call gb_JavaClassSet_get_classdir,$(call
gb_Jar_get_classsetname,$(1))) && \
$(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
