diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-10-31 21:31:24 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-10-31 21:31:24 +0000 |
| commit | fb5d43bb9ecda35862e53e85e3de34217b3dbafb (patch) | |
| tree | 0afa547787942f3ac655d4517b7b6d0960426c55 /navit/xpm | |
| parent | 447c31306a13321371643240687d65add1a45972 (diff) | |
| download | navit-svn-fb5d43bb9ecda35862e53e85e3de34217b3dbafb.tar.gz | |
Fix:build_autotools:Fix default image sizes bug introduced with r5629 affecting maemo and wince builds.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5709 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 dfc8e056..80080042 100644 --- a/navit/xpm/Makefile.am +++ b/navit/xpm/Makefile.am @@ -275,8 +275,8 @@ endef # template to generate scaling rules for the default PNG size define scaling_rule_template_def -%.png: $(srcdir)/%.$(2) - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$$@" "$(1)" "$(1)" +$(basename $(1)).png: $(srcdir)/$(1) + SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$$@" "$(2)" "$(2)" endef @@ -294,7 +294,7 @@ pngs += $(addsuffix .png,$(basename $(flag_svgs))) pngs += $(foreach scale, $(wordlist 2,100,$(svg2png_scales_flag)), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs)))) # create rules from templates $(foreach extension,svg svgz, $(foreach size, $(wordlist 2,100,$(svg2png_scales_flag)),$(eval $(call scaling_rule_template,$(size),$(extension))))) -$(foreach extension,svg svgz, $(foreach size, $(firstword $(svg2png_scales_flag)),$(eval $(call scaling_rule_template_def,$(size),$(extension))))) +$(foreach img,$(flag_svgs), $(foreach size, $(firstword $(svg2png_scales_flag)),$(eval $(call scaling_rule_template_def,$(img),$(size))))) endif # png symbols for navigation |