0002-fix-build.patch (12095B)
1 diff --git i/docs/man/ms2render.htm w/docs/man/ms2render.htm 2 index 652acc2..b5750c3 100644 3 --- i/docs/man/ms2render.htm 4 +++ w/docs/man/ms2render.htm 5 @@ -493,7 +493,7 @@ 6 <dt id="t---types-arg"><b>-t, --types <arg></b></dt> 7 <dd> 8 9 -<p>File with type information. Default: /usr/share/mapsoft2/types.cfg</p> 10 +<p>File with type information. Default: @out@/share/mapsoft2/types.cfg</p> 11 12 </dd> 13 <dt id="q---quite-arg"><b>-q, --quite <arg></b></dt> 14 @@ -559,7 +559,7 @@ 15 <dt id="c---config-arg"><b>-c, --config <arg></b></dt> 16 <dd> 17 18 -<p>Configuration file for vector map rendering. Default: /usr/share/mapsoft2/render.cfg</p> 19 +<p>Configuration file for vector map rendering. Default: @out@/share/mapsoft2/render.cfg</p> 20 21 </dd> 22 <dt id="obj_scale-arg"><b>--obj_scale <arg></b></dt> 23 diff --git i/docs/man/ms2view.htm w/docs/man/ms2view.htm 24 index f178b4a..1fed011 100644 25 --- i/docs/man/ms2view.htm 26 +++ w/docs/man/ms2view.htm 27 @@ -475,7 +475,7 @@ 28 29 <h1 id="CUSTOMIZING-VIEWER-INTERFACE-WITH-CSS-STYLES">CUSTOMIZING VIEWER INTERFACE WITH CSS STYLES</h1> 30 31 -<p>Structure of <b>ms2view</b> window is simple: a viewer, a main menu, a statusbar, tables with waypoints, tracks, and maps, a few dialogs, etc. Appearence of these elements is controlled by GTK3 theme. One can customize it using CSS styles. Styles are read from two places: <b>/usr/share/mapsoft2/mapsoft2.css</b> -- system-wide file. By default it contains a few definitions, mostly for making interface elements smaller. Some tips about viewer structure can be also find there. <b>$HOME/.mapsoft2/mapsoft2.css</b> -- user-specific file.</p> 32 +<p>Structure of <b>ms2view</b> window is simple: a viewer, a main menu, a statusbar, tables with waypoints, tracks, and maps, a few dialogs, etc. Appearence of these elements is controlled by GTK3 theme. One can customize it using CSS styles. Styles are read from two places: <b>@out@/share/mapsoft2/mapsoft2.css</b> -- system-wide file. By default it contains a few definitions, mostly for making interface elements smaller. Some tips about viewer structure can be also find there. <b>$HOME/.mapsoft2/mapsoft2.css</b> -- user-specific file.</p> 33 34 <p>Additional information about writing css styles can be found in GTK3 documentation or GTK theme sources:</p> 35 36 diff --git i/docs/man/ms2view.txt w/docs/man/ms2view.txt 37 index 5469cac..c165c1a 100644 38 --- i/docs/man/ms2view.txt 39 +++ w/docs/man/ms2view.txt 40 @@ -4,7 +4,7 @@ Structure of B<ms2view> window is simple: a viewer, a main menu, a 41 statusbar, tables with waypoints, tracks, and maps, a few dialogs, etc. 42 Appearence of these elements is controlled by GTK3 theme. One can 43 customize it using CSS styles. Styles are read from two places: 44 -B</usr/share/mapsoft2/mapsoft2.css> -- system-wide file. By default it 45 +B<@out@/share/mapsoft2/mapsoft2.css> -- system-wide file. By default it 46 contains a few definitions, mostly for making interface elements smaller. 47 Some tips about viewer structure can be also find there. 48 B<$HOME/.mapsoft2/mapsoft2.css> -- user-specific file. 49 diff --git i/docs/man/ms2vmap.htm w/docs/man/ms2vmap.htm 50 index 8bbeac9..f6ddd9a 100644 51 --- i/docs/man/ms2vmap.htm 52 +++ w/docs/man/ms2vmap.htm 53 @@ -64,7 +64,7 @@ ms2vmap <file> ... -o <out file> [<options>]</code></pre> 54 <dt id="t---types-arg"><b>-t, --types <arg></b></dt> 55 <dd> 56 57 -<p>File with type information. Default: /usr/share/mapsoft2/types.cfg</p> 58 +<p>File with type information. Default: @out@/share/mapsoft2/types.cfg</p> 59 60 </dd> 61 <dt id="D---define-arg"><b>-D, --define <arg></b></dt> 62 diff --git i/docs/man/ms2vmapdb.htm w/docs/man/ms2vmapdb.htm 63 index 8bd5943..c990a0f 100644 64 --- i/docs/man/ms2vmapdb.htm 65 +++ w/docs/man/ms2vmapdb.htm 66 @@ -238,7 +238,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre> 67 <dt id="t---types-arg"><b>-t, --types <arg></b></dt> 68 <dd> 69 70 -<p>File with type information. Default: /usr/share/mapsoft2/types.cfg</p> 71 +<p>File with type information. Default: @out@/share/mapsoft2/types.cfg</p> 72 73 </dd> 74 <dt id="D---define-arg"><b>-D, --define <arg></b></dt> 75 @@ -302,7 +302,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre> 76 <dt id="t---types-arg1"><b>-t, --types <arg></b></dt> 77 <dd> 78 79 -<p>File with type information. Default: /usr/share/mapsoft2/types.cfg</p> 80 +<p>File with type information. Default: @out@/share/mapsoft2/types.cfg</p> 81 82 </dd> 83 <dt id="D---define-arg1"><b>-D, --define <arg></b></dt> 84 @@ -436,7 +436,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre> 85 <dt id="t---types-arg2"><b>-t, --types <arg></b></dt> 86 <dd> 87 88 -<p>File with type information. Default: /usr/share/mapsoft2/types.cfg</p> 89 +<p>File with type information. Default: @out@/share/mapsoft2/types.cfg</p> 90 91 </dd> 92 <dt id="D---define-arg2"><b>-D, --define <arg></b></dt> 93 @@ -646,7 +646,7 @@ ms2vmapdb fig_lib -- make fig library using typeinfo file</code></pre> 94 <dt id="t---types-arg3"><b>-t, --types <arg></b></dt> 95 <dd> 96 97 -<p>File with type information. Default: /usr/share/mapsoft2/types.cfg</p> 98 +<p>File with type information. Default: @out@/share/mapsoft2/types.cfg</p> 99 100 </dd> 101 <dt id="D---define-arg3"><b>-D, --define <arg></b></dt> 102 Submodule modules contains modified content 103 diff --git i/modules/mapview/action_manager.cpp w/modules/mapview/action_manager.cpp 104 index ab16dae..272b454 100644 105 --- i/modules/mapview/action_manager.cpp 106 +++ w/modules/mapview/action_manager.cpp 107 @@ -75,7 +75,7 @@ ActionManager::ActionManager (Mapview * mapview_): 108 ADD_ACT(AMTrkDel, "Edit") 109 ADD_ACT(AMEditData, "Edit") 110 111 - AddMaps("Maps", std::string("/usr/share/") + DATADIR + "/" + MAPS_MENU_FILE); 112 + AddMaps("Maps", std::string("@out@/share/") + DATADIR + "/" + MAPS_MENU_FILE); 113 114 if (getenv("HOME")) { 115 AddSep("Maps"); 116 diff --git i/modules/mapview/mapview.cpp w/modules/mapview/mapview.cpp 117 index 6d461fb..5bd5367 100644 118 --- i/modules/mapview/mapview.cpp 119 +++ w/modules/mapview/mapview.cpp 120 @@ -367,7 +367,7 @@ Mapview::load_css(){ 121 if (!style_context) throw Err() << "Mapview: can't get Gtk::StyleContext"; 122 123 try{ 124 - std::string css_glo = std::string("/usr/share/") + DATADIR + "/" + CSS_FILE; 125 + std::string css_glo = std::string("@out@/share/") + DATADIR + "/" + CSS_FILE; 126 if (file_exists(css_glo) && 127 css_provider->load_from_path(css_glo)){ 128 auto screen = get_screen(); 129 diff --git i/modules/vmap2/vmap2gobj.cpp w/modules/vmap2/vmap2gobj.cpp 130 index e11d3a7..bec01be 100644 131 --- i/modules/vmap2/vmap2gobj.cpp 132 +++ w/modules/vmap2/vmap2gobj.cpp 133 @@ -22,7 +22,7 @@ using namespace std; 134 void 135 ms2opt_add_vmap2_render(GetOptSet & opts){ 136 const char *g = "VMAP2_RENDER"; 137 - opts.add("config", 1,'c',g, "Configuration file for vector map rendering. Default: /usr/share/mapsoft2/render.cfg"); 138 + opts.add("config", 1,'c',g, "Configuration file for vector map rendering. Default: @out/share/mapsoft2/render.cfg"); 139 opts.add("define", 1,0,g, "Definitions for vector map rendering (json object)"); 140 opts.add("obj_scale", 1,0,g, "Rescaling factor for all objects, default 1.0."); 141 opts.add("vmap_minsc", 1,0,g, "Minimum map scale (calculated from the 'natural' " 142 @@ -92,7 +92,7 @@ GObjVMap2::GObjVMap2(VMap2 & map, const Opt &o): GObjMulti(false), map(map) { 143 read_words_defs defs(o.get("define", Opt())); 144 145 int depth = 0; 146 - std::string cfg = opt.get<string>("config", "/usr/share/mapsoft2/render.cfg"); 147 + std::string cfg = opt.get<string>("config", "@out@/share/mapsoft2/render.cfg"); 148 load_conf(cfg, defs, depth); 149 } 150 151 diff --git i/modules/vmap2/vmap2types.cpp w/modules/vmap2/vmap2types.cpp 152 index 6688736..ec77637 100644 153 --- i/modules/vmap2/vmap2types.cpp 154 +++ w/modules/vmap2/vmap2types.cpp 155 @@ -7,12 +7,12 @@ 156 void 157 ms2opt_add_vmap2t(GetOptSet & opts){ 158 const char *g = "VMAP2"; 159 - opts.add("types", 1, 't', g, "File with type information. Default: /usr/share/mapsoft2/types.cfg"); 160 + opts.add("types", 1, 't', g, "File with type information. Default: @out@/share/mapsoft2/types.cfg"); 161 opts.add("define", 1, 'D', g, "Define variables for type information file."); 162 } 163 164 VMap2types::VMap2types(const Opt & o){ 165 - std::string file = o.get("types", "/usr/share/mapsoft2/types.cfg"); 166 + std::string file = o.get("types", "@out@/share/mapsoft2/types.cfg"); 167 if (file == "") return; 168 read_words_defs defs(o.get("define", Opt())); 169 load(file, defs); 170 diff --git i/vmap_data/scripts/vmaps.sh w/vmap_data/scripts/vmaps.sh 171 index aa7537e..b0decd1 100644 172 --- i/vmap_data/scripts/vmaps.sh 173 +++ w/vmap_data/scripts/vmaps.sh 174 @@ -19,12 +19,12 @@ GRID=0; # draw grid 175 176 CMAP=conf/cmap.png; # Colormap 177 CMAP_SRC= # nomenclatere name used for colormap source 178 -REND_CFG=/usr/share/mapsoft2/render.cfg; # Render configuration 179 -TYPEINFO=/usr/share/mapsoft2/types.cfg # Type information 180 -HTM_TEMPL=/usr/share/mapsoft2/map_templ.htm; # template for htm page 181 +REND_CFG=@out@/share/mapsoft2/render.cfg; # Render configuration 182 +TYPEINFO=@out@/share/mapsoft2/types.cfg # Type information 183 +HTM_TEMPL=@out@/share/mapsoft2/map_templ.htm; # template for htm page 184 185 # index files (one set per BRD2_DIR/*.gpx) 186 -TYP=/usr/share/mapsoft2/slazav.typ 187 +TYP=@out@/share/mapsoft2/slazav.typ 188 EXTRA_TRACKS=; # extra tracks to be added to index image 189 JPEG_SCALE=0.2; # scale for jpeg preview images 190 INDEX_SCALE=0.05; # scale for index image (in addition to jpeg_scale) 191 diff --git i/vmap_data/scripts/vmaps_get_fig w/vmap_data/scripts/vmaps_get_fig 192 index fca52c1..e0bce0c 100755 193 --- i/vmap_data/scripts/vmaps_get_fig 194 +++ w/vmap_data/scripts/vmaps_get_fig 195 @@ -9,7 +9,7 @@ 196 ################################################## 197 198 # read global configuration and functions 199 -. vmaps.sh 200 +. @out@/bin/vmaps.sh 201 202 # read local configuration 203 . ./vmaps.conf 204 diff --git i/vmap_data/scripts/vmaps_in w/vmap_data/scripts/vmaps_in 205 index 0670772..4e6869c 100755 206 --- i/vmap_data/scripts/vmaps_in 207 +++ w/vmap_data/scripts/vmaps_in 208 @@ -9,7 +9,7 @@ 209 ################################################## 210 211 # read global configuration and functions 212 -. vmaps.sh 213 +. @out@/bin/vmaps.sh 214 215 # local configuration 216 . ./vmaps.conf 217 diff --git i/vmap_data/scripts/vmaps_mbtiles w/vmap_data/scripts/vmaps_mbtiles 218 index d751d1c..2ab5945 100755 219 --- i/vmap_data/scripts/vmaps_mbtiles 220 +++ w/vmap_data/scripts/vmaps_mbtiles 221 @@ -8,7 +8,7 @@ 222 # see https://github.com/mapbox/mbtiles-spec/blob/master/1.3/spec.md 223 224 # read global configuration and functions 225 -. vmaps.sh 226 +. @out@/bin/vmaps.sh 227 228 # read local configuration 229 . ./vmaps.conf 230 diff --git i/vmap_data/scripts/vmaps_out w/vmap_data/scripts/vmaps_out 231 index 8372b7f..288e5e2 100755 232 --- i/vmap_data/scripts/vmaps_out 233 +++ w/vmap_data/scripts/vmaps_out 234 @@ -12,7 +12,7 @@ 235 ################################################## 236 237 # read global configuration and functions 238 -. vmaps.sh 239 +. @out@/bin/vmaps.sh 240 241 # read local configuration 242 . ./vmaps.conf 243 diff --git i/vmap_data/scripts/vmaps_preview w/vmap_data/scripts/vmaps_preview 244 index 757dacc..4a7612c 100755 245 --- i/vmap_data/scripts/vmaps_preview 246 +++ w/vmap_data/scripts/vmaps_preview 247 @@ -3,7 +3,7 @@ 248 ################################################## 249 250 # read global configuration and functions 251 -. vmaps.sh 252 +. @out@/bin/vmaps.sh 253 254 # read local configuration 255 . ./vmaps.conf 256 diff --git i/vmap_data/scripts/vmaps_sqlitedb w/vmap_data/scripts/vmaps_sqlitedb 257 index 70a3d6b..e683232 100755 258 --- i/vmap_data/scripts/vmaps_sqlitedb 259 +++ w/vmap_data/scripts/vmaps_sqlitedb 260 @@ -6,7 +6,7 @@ 261 # Tile format: x-y-z.png, z/x-y.png 262 263 # read global configuration and functions 264 -. vmaps.sh 265 +. @out@/bin/vmaps.sh 266 267 # read local configuration 268 . ./vmaps.conf 269 diff --git i/vmap_data/scripts/vmaps_wp_update w/vmap_data/scripts/vmaps_wp_update 270 index 667057e..5ac21d7 100755 271 --- i/vmap_data/scripts/vmaps_wp_update 272 +++ w/vmap_data/scripts/vmaps_wp_update 273 @@ -12,7 +12,7 @@ 274 ################################################## 275 276 # read global configuration and functions 277 -. vmaps.sh 278 +. @out@/bin/vmaps.sh 279 280 # read local configuration 281 . ./vmaps.conf