summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--src/gipfel.cxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 28acc01..62a4c65 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="-Wall -g -I/usr/local/include -DGIPFEL_DATADIR=\\\"$datadir\\\" -DDOCDIR=\\\"$docdir\\\" $CPPFLAGS"
+CPPFLAGS="-Wall -g -I/usr/local/include -DSTD_DATADIR=\\\"$datadir\\\" -DDOCDIR=\\\"$docdir\\\" $CPPFLAGS"
LDFLAGS="-g $LDFLAGS"
# Checks for programs.
diff --git a/src/gipfel.cxx b/src/gipfel.cxx
index c7e07d2..d8ca0b9 100644
--- a/src/gipfel.cxx
+++ b/src/gipfel.cxx
@@ -40,12 +40,12 @@
#include "choose_hill.H"
#include "../config.h"
-#ifndef GIPFEL_DATADIR
-#define GIPFEL_DATADIR "/usr/local/share"
+#ifndef STD_DATADIR
+#define STD_DATADIR "/usr/local/share"
#endif
+#define GIPFEL_DATADIR STD_DATADIR "/" PACKAGE_NAME
#define DATAFILE "gipfel.dat"
-#define DEFAULT_DATADIR GIPFEL_DATADIR "/" PACKAGE_NAME
static char *run_dir = NULL;
static char *img_file = NULL;
@@ -580,7 +580,7 @@ int main(int argc, char** argv) {
img_file = strdup(my_argv[0]);
if (data_file == NULL)
- data_file = file_installed_or_local(DEFAULT_DATADIR, "gipfel.dat");
+ data_file = file_installed_or_local(GIPFEL_DATADIR, "gipfel.dat");
if (data_file == NULL || err) {
usage();