From 91c74ae9f7fe595c486fd9979f888b5fc06393b3 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Tue, 7 Apr 2009 09:14:38 +0200
Subject: DATADIR -> GIPFEL_DATADIR

---
 configure.ac   | 2 +-
 src/gipfel.cxx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e20034e..de7e818 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 -DDATADIR=\\\"$datadir\\\" -DDOCDIR=\\\"$docdir\\\" $CPPFLAGS"
+CPPFLAGS="-Wall -g -I/usr/local/include -DGIPFEL_DATADIR=\\\"$datadir\\\" -DDOCDIR=\\\"$docdir\\\" $CPPFLAGS"
 LDFLAGS="-g $LDFLAGS"
 
 # Checks for programs.
diff --git a/src/gipfel.cxx b/src/gipfel.cxx
index 8fcc45f..f10c7c3 100644
--- a/src/gipfel.cxx
+++ b/src/gipfel.cxx
@@ -39,11 +39,11 @@
 #include "choose_hill.H"
 #include "../config.h"
 
-#ifndef DATADIR
-#define DATADIR "/usr/local/share"
+#ifndef GIPFEL_DATADIR
+#define GIPFEL_DATADIR "/usr/local/share"
 #endif
 
-#define DEFAULT_DATAFILE DATADIR "/" PACKAGE_NAME "/gipfel.dat"
+#define DEFAULT_DATAFILE GIPFEL_DATADIR "/" PACKAGE_NAME "/gipfel.dat"
 
 char *img_file = NULL;
 char *data_file = DEFAULT_DATAFILE;
-- 
cgit v1.2.3