Fix:xpm:Make workable if used outside of srcdir

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@1773 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am
index b744d01..df05988 100644 (file)
--- a/navit/xpm/Makefile.am
+++ b/navit/xpm/Makefile.am
@@ -161,8 +161,8 @@ if USE_SVG
 endif
 
 if USE_SVG2PNG
-%.png:*.svg
-       $(srcdir)/navit_svg2png "$@"
+%.png:$(srcdir)/*.svg
+       SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "$@"
 xpm_DATA += $(addsuffix .png,$(basename $(svgs)))
 if USE_SVG2PNG_SCALES
 xpm_DATA += $(foreach scale, @SVG2PNG_SCALES@, $(addsuffix _$(scale)_$(scale).png,$(basename $(svgs))))

diff --git a/navit/xpm/navit_svg2png b/navit/xpm/navit_svg2png
index 28ccca0..70c29e5 100755 (executable)
--- a/navit/xpm/navit_svg2png
+++ b/navit/xpm/navit_svg2png
@@ -8,16 +8,26 @@ then
        h=${h%.png}
        w=${w##*_}
 else
-       w=$(grep 'width=".*px"' gui_actions.svg | head -n 1 | sed -e 's/px".*//' -e 's/.*"//')
-       h=$(grep 'height=".*px"' gui_actions.svg | head -n 1 | sed -e 's/px".*//' -e 's/.*"//')
        svg=${png%.png}
 fi
+if [ ! -f $svg.svg -a ! -f $svg.svgz ]
+then
+       svg="$SRCDIR/$svg"
+fi
 if [ -f $png -a ! -f $svg.svg ]
 then
        touch $png
 else
        if [ -f $svg.svg ]
        then
+               if [ -z "$w" ]
+               then
+                       w=$(grep 'width="[0-9px.]*"' $svg.svg | head -n 1 | sed -e 's/^[^"]*"//' -e 's/[px]*".*//')
+               fi
+               if [ -z "$h" ]
+               then
+                       h=$(grep 'height="[0-9px.]*"' $svg.svg | head -n 1 | sed -e 's/^[^"]*"//' -e 's/[px]*".*//')
+               fi
                ksvgtopng $w $h $svg.svg $png
        elif [ -f $svg.svgz ]
        then