diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-29 13:15:02 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-29 13:15:42 +0100 |
| commit | 536bf877b747bb119df911d3025a466efb7b8c82 (patch) | |
| tree | e1755223d2b6a9ae2b314b8fcc70a8c362e2bd4a | |
| parent | 9c53350ab8d0c901bf56d0ba4c395913eea2e82b (diff) | |
respect DO_FETCH_TARBALLS again
| -rwxr-xr-x | set_soenv.in | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_AuxTargets.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/set_soenv.in b/set_soenv.in index 10a0937ee7ea..3011c098f20b 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 c947ee3ec819..fcdf2f41c660 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 |