Re: [Libreoffice] [PATCH] Fix the last commit in build repository.

Hi Sebastian,

Sebastian Spaeth wrote:
> On Sat, 13 Nov 2010 16:09:26 +0100, Giuseppe Castagno wrote:
> > --- a/bin/install-artwork
>
> > +. bin/setup
>
> While that patch might fix things, I believe a script in ./bin should
> not assume anything about what the current working directory is. We
> should either use a relative directory, relative to the script
> location. Or we should source some configuration file created by
> ./configure to read in the relevant directories.

I think you are right, I attached a revised version of the patch.

I believe this one is a little better, unless I'm completely wrong and 
the entire ef57e0668c2171036759f244a8bb6b6cc753f594 commit should be 
reverted for some other reason...

beppec56.

--
Kind Regards,
Giuseppe Castagno
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu
beppec56 at openoffice.org

From 932e360a71a2175a2dccdf0fde1e7a2c169b9e54 Mon Sep 17 00:00:00 2001
From: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Date: Sat, 13 Nov 2010 16:02:56 +0100
Subject: [PATCH] Fix for commit ef57e0668c2171036759f244a8bb6b6cc753f594.

File sourced outside install-artwork.
---
 Makefile.am         |    2 +-
 bin/install-artwork |    2 --
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b9da4ee..63a92cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,7 @@ $(STAMP_DIR)/artwork.install : $(OOBUILDDIR)/unpack \
                              $(STAMP_DIR)/prebuild \
                              $(wildcard $(top_srcdir)/src/*.png) \
                              $(wildcard $(top_srcdir)/src/*.bmp)
-       $(TOOLSDIR)/bin/install-artwork $(top_srcdir)/src $(OOBUILDDIR)
+       . $(TOOLSDIR)/bin/setup $(TOOLSDIR)/bin/install-artwork $(top_srcdir)/src $(OOBUILDDIR)
        touch $@
 
 patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/refresh $(STAMP_DIR)/patch.apply
diff --git a/bin/install-artwork b/bin/install-artwork
index cbb314d..be73b4d 100755
--- a/bin/install-artwork
+++ b/bin/install-artwork
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. ./setup
-
 # installs artwork, opportunistically from src to dest
 
 src=$1
-- 
1.6.3.3