[Libreoffice-commits] .: 2 commits - Makefile.in solenv/bin

[Jan Holesovsky]

 Makefile.in       |    9 +++++----
 solenv/bin/linkoo |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 6b071f5b745789ae700fd631b8cf2fa0f07ab6b5
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jul 26 15:32:58 2011 +0200

    make dev-install creates a linked installation again.
    
    Also, skip building of stuff that we have already built.

diff --git a/Makefile.in b/Makefile.in
index d0b7087..510455a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,13 +101,14 @@ install:
 
 dev-install:
 	@. ./Env.Host.sh && \
-        cd smoketestoo_native && \
+	cd smoketestoo_native && \
 		export SAL_USE_VCLPLUGIN="svp" && \
-		build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@ && \
+		build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all:instsetoo_native -- -P at BUILD_MAX_JOBS@ && \
 		cd @abs_builddir@ && ln -s $$SOLARVER/$$INPATH/installation/opt/ install && \
 		echo "" && \
-        echo "Developer installation finished, you can now execute:"
-	@if test `uname -s` = Darwin; then \
+	$$SOLARENV/bin/linkoo $$SRC_ROOT/install $$SRC_ROOT && \
+	echo && echo "Developer installation finished, you can now execute:" && echo && \
+	if test `uname -s` = Darwin; then \
 		echo open install/LibreOffice.app; \
 	else \
 		echo "cd @abs_builddir@/install/program" && \
commit 047f4dffe5104c4ebe0b26fc612b4727cb2b9766
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jul 26 15:31:06 2011 +0200

    Fix linkoo to work again after the *.Set.sh -> Env.Host.sh rename.

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index a1a469a..ae6a7f2 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -99,7 +99,7 @@ sub sniff_target($)
 
     opendir ($dirhandle, $build_dir) || die "Can't open $build_dir";
     while ($fname = readdir ($dirhandle)) {
-	$fname =~ /Set.sh$/ || next;
+	$fname =~ /Host.sh$/ || next;
 
 	my $file;
 	open ($file, "$build_dir/$fname") || die "Can't open $build_dir/$fname";