ooo-build r14167 - trunk

[jannieuw svn gnome org]

Author: jannieuw
Date: Wed Oct  1 10:56:39 2008
New Revision: 14167
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14167&view=rev

Log:
2008-10-01  Jan Nieuwenhuizen  <janneke gnu org>

	* Makefile.shared: Use || true rather than -.  Fixes useless
	display and ignoring of intriguing error messages.  Thanks
	Michael.


Modified:
   trunk/ChangeLog
   trunk/Makefile.shared

Modified: trunk/Makefile.shared
==============================================================================
--- trunk/Makefile.shared	(original)
+++ trunk/Makefile.shared	Wed Oct  1 10:56:39 2008
@@ -11,13 +11,13 @@
 unpack : $(OOBUILDDIR)/unpack $(top_srcdir)/bin/unpack
 $(OOBUILDDIR)/unpack :
 	$(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
-	-test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare
+	test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true
 	if test -d $(OOBUILDDIR)/applied_patches ; then \
 		FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
 		chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -f -R ; \
 	fi
 	cd $(top_srcdir)/bin ; ./unpack
-	-test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare
+	test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true
 	rm -f $(STAMP_DIR)/build $(STAMP_DIR)/patch.apply \
 	      $(STAMP_DIR)/artwork.install
 	touch $@
@@ -46,12 +46,12 @@
 	fi
 
 	$(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR)
-	-test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare
+	test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) prepare || true
 	FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
 	chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --tag=$(CVSTAG) ;
-	-test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare
+	test -n "$(OOO_GIT)" && $(TOOLSDIR)/bin/gob --build-dir=$(OOBUILDDIR) postpare || true
 	$(TOOLSDIR)/bin/transform --apply $(TOOLSDIR) $(OOBUILDDIR)
-	-test -n "$(OOO_GIT)" && cd $(OOBUILDDIR) && git-commit -am 'Font munging.'
+	test -n "$(OOO_GIT)" && cd $(OOBUILDDIR) && git-commit -am 'Font munging.' || true
 	$(TOOLSDIR)/bin/fix-deps $(OOBUILDDIR)
 	rm -f $(STAMP_DIR)/build
 	touch $@