diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-11-07 09:08:19 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-11-07 09:08:19 +0000 |
| commit | 9f40ce6e4c45cb30d30adbcecda0dce83f075081 (patch) | |
| tree | f52aa8fcc0b53c1c5f83d99d63f10a221834cb43 /navit/maps | |
| parent | f439b68fcbe86925ab968df3f01ea7931096bd42 (diff) | |
| download | navit-9f40ce6e4c45cb30d30adbcecda0dce83f075081.tar.gz | |
Fix:maptool:Further cleanups, enabled for building
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2725 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maps')
| -rw-r--r-- | navit/maps/Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/navit/maps/Makefile.am b/navit/maps/Makefile.am index 28f541ada..3b0fba248 100644 --- a/navit/maps/Makefile.am +++ b/navit/maps/Makefile.am @@ -4,7 +4,8 @@ include $(top_srcdir)/Makefile.inc SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2 -osm2navit_args=--attr-debug-level=5 +maptool_args=--attr-debug-level=5 +maptool=$(top_builddir)/navit/maptool/maptool maps_DATA = $(SAMPLE_MAP).bin $(SAMPLE_MAP).xml @@ -14,16 +15,16 @@ samplemap: $(SAMPLE_MAP).bin .osm.bin: echo "Converting osm map" - $(top_builddir)/navit/osm2navit $(osm2navit_args) $@.tmp <$< + $maptool $(maptool_args) $@.tmp <$< mv $@.tmp $@ .txt.bin: - $(top_builddir)/navit/osm2navit $(osm2navit_args) $@.tmp -p ../map/textfile/libmap_textfile.la -m $< + $maptool $(maptool_args) $@.tmp -p ../map/textfile/libmap_textfile.la -m $< mv $@.tmp $@ .osm.bz2.bin: echo "Converting osm map" - bzcat $< | $(top_builddir)/navit/osm2navit $(osm2navit_args) $@.tmp + bzcat $< | $maptool $(maptool_args) $@.tmp mv $@.tmp $@ .bin.xml: |