diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-19 19:06:24 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2012-04-19 19:06:24 +0000 |
| commit | 3b1455ae1df98f22933322e2bbbf1af9a99b6b78 (patch) | |
| tree | cd445458e463245d6cec30dc037eb459005d9407 /navit/xpm | |
| parent | 511bd3202a0518a793649d5b1324426a9e21bd70 (diff) | |
| download | navit-svn-3b1455ae1df98f22933322e2bbbf1af9a99b6b78.tar.gz | |
Fix:xpm:Do not hardcode rsvg-convert for SVG->PNG conversion in autotools build.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5022 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/xpm')
| -rw-r--r-- | navit/xpm/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am index 897fa62a..5bd91bd3 100644 --- a/navit/xpm/Makefile.am +++ b/navit/xpm/Makefile.am @@ -216,9 +216,9 @@ if USE_SVG2PNG # Implicit rules for generating the PNG files. This only generates the # standard size; for additional sizes see below. %.png: $(srcdir)/%.svg - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "/usr/bin/rsvg-convert" "$@" + SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@" %.png: $(srcdir)/%.svgz - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "/usr/bin/rsvg-convert" "$@" + SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@" pngs = $(addsuffix .png,$(basename $(svgs))) xsize = $(word 1,$(subst x, ,$(scale))) @@ -228,7 +228,7 @@ comma =, # template to generate scaling rules for the various PNG sizes define scaling_rule_template %_$(1)_$(1).png: $(srcdir)/%.$(2) - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "/usr/bin/rsvg-convert" "$$@" + SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$$@" endef # png images of the user interface and other, sizes e.g. "8,16,32,48,96" |