diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2017-08-25 19:07:46 +0200 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2017-08-25 10:07:46 -0700 |
| commit | f5abdd317e10d56226300d001469595658a605e4 (patch) | |
| tree | 5f2722cb7929d406201730ae967f3f3cf69df8f8 /contrib | |
| parent | 0d5ef51e8cd6dd6e03832e995cdae2a8c02c4da6 (diff) | |
| download | navit-f5abdd317e10d56226300d001469595658a605e4.tar.gz | |
Moved xpm to icons (#307)
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/sailfish/navit-sailfish.spec | 4 | ||||
| -rw-r--r-- | contrib/sjjb_import.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec index 6beb84fab..d11a3fc70 100755 --- a/contrib/sailfish/navit-sailfish.spec +++ b/contrib/sailfish/navit-sailfish.spec @@ -79,7 +79,7 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DNAVIT_BINARY:STRING=harbour-navit \ -DSHARE_DIR:PATH=share/harbour-navit \ -DLOCALE_DIR:PATH=share/harbour-navit/locale \ - -DIMAGE_DIR:PATH=share/harbour-navit/xpm \ + -DIMAGE_DIR:PATH=share/harbour-navit/icons \ -DLIB_DIR:PATH=share/harbour-navit/lib \ -DBUILD_MAPTOOL:BOOL=FALSE \ -Dfont/freetype:BOOL=FALSE \ @@ -107,7 +107,7 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \ %files %defattr(644, root, root, 755) %{_datadir}/harbour-navit/navit.xml -%{_datadir}/harbour-navit/xpm/ +%{_datadir}/harbour-navit/icons/ %{_datadir}/harbour-navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin %{_datadir}/harbour-navit/espeak-data/ %{_datadir}/applications/harbour-navit.desktop diff --git a/contrib/sjjb_import.pl b/contrib/sjjb_import.pl index 538c205c4..9c5b61e1a 100644 --- a/contrib/sjjb_import.pl +++ b/contrib/sjjb_import.pl @@ -201,7 +201,7 @@ sub get_arg { } $sjjb_dir= get_arg(0, "Directory holding the extracted svg's from http://www.sjjb.co.uk/mapicons/downloads"); -$dest_dir= $ARGV[1] ? $ARGV[1] : dirname(__FILE__)."/../navit/xpm/"; +$dest_dir= $ARGV[1] ? $ARGV[1] : dirname(__FILE__)."/../navit/icons/"; foreach $i (@icons) { my ($path, $icon)= split('/', $i->[0]); |