| author | Tor Lillqvist <tml@iki.fi> | 2012-08-16 07:38:26 (GMT) |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-16 07:42:04 (GMT) |
| commit | b0db8fbdb58d40998ea6ba144c07c73becbed0f0 (patch) (side-by-side diff) | |
| tree | bae81a571d6125d334893b1be793bfe77c377c4f | |
| parent | b3a50700c789ad6a26cf6b4fb324c83a81ed7c43 (diff) | |
| download | core-b0db8fbdb58d40998ea6ba144c07c73becbed0f0.zip core-b0db8fbdb58d40998ea6ba144c07c73becbed0f0.tar.gz | |
No need to bother with the MISCDUMMY file here
This rule failed if the MISCDUMMY file did not exist yet.
Change-Id: Ie9b1ecab2848f5ed2c459020a50013db691a9ca3
| -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 1b9b370..1985d3b 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -61,7 +61,7 @@ define gb_Jar__command echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \ $(if $(JARCLASSPATH),echo "Class-Path: $(strip $(JARCLASSPATH))" >> $(call gb_Jar_get_manifest_target,$(1)) &&) \ echo "Solar-Version: $(RSCREVISION)" >> $(call gb_Jar_get_manifest_target,$(1)) && \ - cat $(if $(MANIFEST),$(MANIFEST),$(gb_Helper_MISCDUMMY)) >> $(call gb_Jar_get_manifest_target,$(1)) && \ + $(if $(MANIFEST),cat $(MANIFEST) >> $(call gb_Jar_get_manifest_target,$(1)) &&) \ mkdir -p $(dir $(2)) && cd $(call gb_Jar_get_workdir,$(1)) && \ $(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \ META-INF $(PACKAGEROOTS) $(PACKAGEFILES) \ |