fixing use of conflicting DATADIR in dia/lib

["lode leroy" <lode_leroy hotmail com>]

diff -bruw dia-cvs-snapshot-20050427-0300/lib/Makefile.am 
dia-head/lib/Makefile.am
--- dia-cvs-snapshot-20050427-0300/lib/Makefile.am      2005-03-28 
05:00:04.000000000 +0200
+++ dia-head/lib/Makefile.am    2005-04-28 15:02:13.766424000 +0200
@@ -166,8 +166,8 @@

AM_CPPFLAGS = \
       $(LIBART_CFLAGS) \
-       -DLIBDIR=\"$(libdir)\" \
-       -DDATADIR=\"$(pkgdatadir)\"
+       -DDIA_LIBDIR=\"$(libdir)\" \
+       -DDIA_DATADIR=\"$(pkgdatadir)\"

sheetdir = $(pkgdatadir)/sheets

diff -bruw dia-cvs-snapshot-20050427-0300/lib/dia_dirs.c 
dia-head/lib/dia_dirs.c

--- dia-cvs-snapshot-20050427-0300/lib/dia_dirs.c       2005-01-15 
17:46:09.000000000 +0100
+++ dia-head/lib/dia_dirs.c     2005-04-28 15:02:53.603707200 +0200
@@ -54,9 +54,9 @@

#else
  if (strlen (subdir) == 0)
-    return g_strconcat (DATADIR, NULL);
+    return g_strconcat (DIA_DATADIR, NULL);
  else
-    return g_strconcat (DATADIR, G_DIR_SEPARATOR_S, subdir, NULL);
+    return g_strconcat (DIA_DATADIR, G_DIR_SEPARATOR_S, subdir, NULL);
#endif
}

@@ -83,7 +83,7 @@
  return g_strconcat (sLoc , subdir, NULL);

#else
-  return g_strconcat (LIBDIR, G_DIR_SEPARATOR_S, subdir, NULL);
+  return g_strconcat (DIA_LIBDIR, G_DIR_SEPARATOR_S, subdir, NULL);
#endif
}

_________________________________________________________________