Ticket #45281: configure.ac-and-svg2png.sh.in.diff

tango-icon-theme-0.8.90

@@ -82 +82 @@
    PKG_CHECK_EXISTS([librsvg-2.0 >= 2.12.3],
                     [enable_large_bitmaps=yes], [enable_large_bitmaps=no])
    if test "x$enable_large_bitmaps" = "xyes"; then
-      svgconvert_prog="rsvg"
+      svgconvert_prog="rsvg-convert"
    else
       svgconvert_prog="ksvgtopng"
    fi

tango-icon-theme-0.8.90

@@ -9 +9 @@
 
 ICONFILE=`basename ${3}`
 ICONNAME=`echo ${ICONFILE} | sed -e "s/.svg//"`
-if test `basename $SVGCONVERT` = "rsvg"; then
+if test `basename $SVGCONVERT` = "rsvg-convert"; then
     OPTIONS="-w ${1} -h ${1}"
+    OUTPUT="-o"
 else
     OPTIONS="${1} ${1}"
+    OUTPUT=""
 fi
 
 echo "${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png"
-${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png
+${SVGCONVERT} ${OPTIONS} ${3} ${OUTPUT} ${2}/${ICONNAME}.png