[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/Helper.mk |    2 --
 solenv/gbuild/Jar.mk    |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit b0db8fbdb58d40998ea6ba144c07c73becbed0f0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 16 10:38:26 2012 +0300

    No need to bother with the MISCDUMMY file here
    
    This rule failed if the MISCDUMMY file did not exist yet.
    
    Change-Id: Ie9b1ecab2848f5ed2c459020a50013db691a9ca3

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) \
commit b3a50700c789ad6a26cf6b4fb324c83a81ed7c43
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Aug 16 10:36:15 2012 +0300

    Let's not overdo the abstraction, /dev/null is just fine to use as such
    
    Change-Id: Ib291d5b053f9ed7b597f0ebbed725602430e36b7

diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 93a0ad7..0c241f6 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -26,8 +26,6 @@
 #
 #*************************************************************************
 
-gb_Helper_NULLFILE := /dev/null
-
 gb_Helper_MISC := $(WORKDIR)/Misc
 
 # general purpose phony target