[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-905-g8eac189

[Alexander Bokovoy]

The branch, master has been updated
       via  8eac1896299d820fec0fd92b2b8b6a058ae39642 (commit)
       via  217e3086c74eb0b46fab512b5887d9a5a5b7ee9a (commit)
      from  d296c774c5981baa863c697782dba1b6280d632e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8eac1896299d820fec0fd92b2b8b6a058ae39642
Merge: 217e3086c74eb0b46fab512b5887d9a5a5b7ee9a d296c774c5981baa863c697782dba1b6280d632e
Author: Alexander Bokovoy <ab at samba.org>
Date:   Sat Aug 8 08:07:24 2009 +0300

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 217e3086c74eb0b46fab512b5887d9a5a5b7ee9a
Author: Alexander Bokovoy <ab at samba.org>
Date:   Sat Aug 8 08:02:52 2009 +0300

    Pass absolute file paths to Inkscape when transforming .svg files
    
    Some recent versions of Inkscape (0.47 or around) have bug when export file name
    is treated as relative against the directory of original .svg if it wasn't specified
    as an absolute path. Fix it by always using absolute paths during conversion.

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 717d067..40a6c7b 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -153,10 +153,10 @@ $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-eps
 	$(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t ps -o $@ $<
 
 %.eps: %.svg
-	$(INKSCAPE) -z -f $< --export-eps=$@
+	$(INKSCAPE) -z -f $(abspath $<) --export-eps=$(abspath $@)
 
 %.png: %.svg
-	$(INKSCAPE) -z -f $< --export-png=$@
+	$(INKSCAPE) -z -f $(abspath $<) --export-png=$(abspath $@)
 
 %.eps: %.png
 	$(PNGTOPNM) $< | $(PNMTOPS) > $@


-- 
Samba Shared Repository