diff options
| author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2005-08-15 11:20:07 +0100 |
|---|---|---|
| committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2005-08-15 11:20:07 +0100 |
| commit | b01abf3aabb09639349351c3a9c64eb136a35842 (patch) | |
| tree | 0841b9e05a1d01ad0d8fe2a75628a916f2031398 | |
| parent | e7a2566a7a4d6b52d64536737bb4bca5fd08c605 (diff) | |
add support for default datafile
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/gipfel.cxx | 12 |
3 files changed, 17 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index af437a6..205a86a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1,7 @@ SUBDIRS = src + +EXTRA_DIST = alpinkoordinaten.dat + +gpsdir = $(datadir)/gipfel + +gps_DATA = alpinkoordinaten.dat diff --git a/configure.ac b/configure.ac index 08330d7..088b07a 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/Panorama.H]) AC_CONFIG_HEADER(config.h) -CPPFLAGS="-g -I/usr/local/include $CPPFLAGS" +CPPFLAGS="-g -I/usr/local/include -DDATADIR=\\\"$datadir\\\" $CPPFLAGS" CXXFLAGS="-g -I/usr/local/include $CXXFLAGS" LDFLAGS="-g $LDFLAGS" diff --git a/src/gipfel.cxx b/src/gipfel.cxx index 9db82fa..221bcec 100644 --- a/src/gipfel.cxx +++ b/src/gipfel.cxx @@ -50,9 +50,17 @@ #include "Fl_Search_Chooser.H" #include "GipfelWidget.H" #include "choose_hill.H" +#include "../config.h" + +#ifndef DATADIR +#define DATADIR "/usr/local/share" +#endif + +#define DEFAULT_DATAFILE DATADIR "/" PACKAGE_NAME "/alpinkoordinaten.dat" char *img_file; -char *data_file; +char *data_file = DEFAULT_DATAFILE; + GipfelWidget *gipf = NULL; Fl_Dial *s_center = NULL; Fl_Slider *s_nick = NULL, *s_scale = NULL, *s_tilt = NULL, *s_height_dist; @@ -321,7 +329,7 @@ int main(int argc, char** argv) { exit(1); } - +fprintf(stderr, "%s\n", data_file); control_win = create_control_window(); view_win = new Fl_Window(800, 600); |