[Libreoffice-commits] .: download .gitignore Makefile.in

Christian Lohmaier cloph at kemper.freedesktop.org
Sat Jan 8 09:46:59 PST 2011


 .gitignore  |    1 +
 Makefile.in |    6 +++---
 download    |    4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 4b8bf5c2eed95fe01094577b9983432879e9e2ea
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Jan 8 18:45:25 2011 +0100

    small fixes to allow using --with-linked-git & --with-external-tar

diff --git a/.gitignore b/.gitignore
index 4c3b821..5876759 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@
 /visibility.cxx
 /post_download
 /bin/repo-list
+/src.downloaded
 
 # misc
 /set_soenv.last
diff --git a/Makefile.in b/Makefile.in
index 4979b93..89da7c5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 
 SHELL=/usr/bin/env bash
 
-all: Makefile dmake/dmake at EXEEXT@ fetch
+all: Makefile dmake/dmake at EXEEXT@ src.downloaded
 	@. ./*[Ee]nv.[Ss]et.sh && \
         cd instsetoo_native && \
         build.pl -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
@@ -34,11 +34,11 @@ dmake/dmake at EXEEXT@:
 	@. ./*[Ee]nv.[Ss]et.sh && \
         ./bootstrap
 
-src/downloaded: ooo.lst download
+src.downloaded: ooo.lst download
 	@. ./*[Ee]nv.[Ss]et.sh && \
 	$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
 
-fetch: src/downloaded
+fetch: src.downloaded
 
 Makefile: configure.in set_soenv.in Makefile.in
 	./autogen.sh
diff --git a/download b/download
index 5002d0f..b839bd8 100755
--- a/download
+++ b/download
@@ -42,6 +42,9 @@ if [ -d .git ] ; then
         mkdir clone
         for i in $GIT_REPO_NAMES ; do
             bin/git-new-workdir $GIT_LINK_SRC/$i clone/$i
+            for i in clone/$i/* ; do
+                ln -sf $i $(basename $i)
+            done
         done
     fi
 fi
@@ -229,3 +232,4 @@ fi
 [ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
 
 ./post_download || exit 1
+# vim:set shiftwidth=4 softtabstop=4 expandtab:


More information about the Libreoffice-commits mailing list