[Libreoffice-commits] .: set_soenv.in solenv/gbuild

[Bjoern Michaelsen]

 set_soenv.in                                |    2 +-
 solenv/gbuild/extensions/post_AuxTargets.mk |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 536bf877b747bb119df911d3025a466efb7b8c82
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Nov 29 13:15:02 2011 +0100

    respect DO_FETCH_TARBALLS again

diff --git a/set_soenv.in b/set_soenv.in
index 10a0937..3011c09 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1484,7 +1484,7 @@ ToFile( "LIBDIR",            "@LIBDIR@",         "e" );
 ToFile( "DATADIR",           "@DATADIR@",        "e" );
 ToFile( "MANDIR",            "@MANDIR@",         "e" );
 ToFile( "DOCDIR",            "@DOCDIR@",          "e" );
-ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS", "e" );
+ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" );
 ToFile( "BUILD_MOZAB",       "@BUILD_MOZAB@",    "e" );
 ToFile( "PREBUILD_MOZAB",    $PREBUILD_MOZAB,    "e" );
 ToFile( "MOZILLA_VERSION",   $MOZILLA_VERSION,   "e" );
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index c947ee3..fcdf2f4 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -43,7 +43,8 @@ distro-pack-install: install
 	$(SRCDIR)/bin/distro-install-file-lists
 
 $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
-	@$(SRCDIR)/download $(SRCDIR)/ooo.lst && touch $@
+	$(if $(filter YES,$(DO_FETCH_TARBALLS)),@$(SRCDIR)/download $(SRCDIR)/ooo.lst)
+	@touch $@
 
 fetch: $(SRCDIR)/src.downloaded