diff options
author | Peter Foley <pefoley2@verizon.net> | 2011-09-17 18:54:32 -0400 |
---|---|---|
committer | Peter Foley <pefoley2@verizon.net> | 2011-09-17 18:54:32 -0400 |
commit | 1e928fd948005664dbb32bc945808273e56b2ee6 (patch) | |
tree | f64f9d3aa50c278fb3f0c297fea0d6f74eb18385 /solenv | |
parent | 27ba6af823a3c174326d1e9c19aa114abd71f03e (diff) |
don't try to cat a non existent Jar manifest
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/Jar.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 652331aa4155..b30bd3a0980c 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)) \ |