[Libreoffice-commits] .: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/TargetLocations.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4171501c49e345266e892e35e6c224deb1b34f55
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 31 12:50:52 2012 +0100

    Avoid trailing slashes in xsltproc schemaRoot param
    
    ...as some xslt procs are confused by paths containing // IIRC
    and that would explain a Win-x86 at 7-MinGW tinderbox failure.

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b49f890..4dabdac 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -49,7 +49,8 @@ gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
 gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
 # outdir targets: $(1) is path
 gb_Configuration_registry = $(OUTDIR)/xml/registry
-gb_XcsTarget_get_outdir_target = $(gb_Configuration_registry)/schema/$(1)
+gb_XcsTarget_get_outdir_target = \
+    $(gb_Configuration_registry)/schema$(if $(1),/)$(1)
 gb_XcuDataTarget_get_outdir_target = $(gb_Configuration_registry)/data/$(1)
 gb_XcuLangpackTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
 gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)