[PATCH] Fix for commit ef57e0668c2171036759f244a8bb6b6cc753f594.

Giuseppe Castagno giuseppe.castagno at acca-esse.eu
Sat Nov 13 07:02:56 PST 2010


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


--------------060509020008030405080804--


More information about the LibreOffice mailing list