From 60809b318d27cf0b8cdc5e520bfe48316619afde Mon Sep 17 00:00:00 2001
From: tsauerbeck <tsauerbeck>
Date: Wed, 23 Feb 2005 20:55:18 +0000
Subject: [PATCH] got rid of data subdirectory in pkgdatadir

SVN revision: 13485
---
 legacy/ecore/data/fonts/Makefile.am    | 2 +-
 legacy/ecore/data/images/Makefile.am   | 2 +-
 legacy/ecore/data/pointers/Makefile.am | 2 +-
 legacy/ecore/src/bin/ecore_evas_test.h | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/legacy/ecore/data/fonts/Makefile.am b/legacy/ecore/data/fonts/Makefile.am
index a3eb113671..17f0307d79 100644
--- a/legacy/ecore/data/fonts/Makefile.am
+++ b/legacy/ecore/data/fonts/Makefile.am
@@ -2,7 +2,7 @@ FILES = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf \
         VeraMoBd.ttf VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf \
         fonts.alias fonts.dir
 
-fontsdir = $(pkgdatadir)/data/fonts
+fontsdir = $(pkgdatadir)/fonts
 fonts_DATA = $(FILES)
 
 EXTRA_DIST = $(FILES)
diff --git a/legacy/ecore/data/images/Makefile.am b/legacy/ecore/data/images/Makefile.am
index f0fba20a2a..3542a803da 100644
--- a/legacy/ecore/data/images/Makefile.am
+++ b/legacy/ecore/data/images/Makefile.am
@@ -1,7 +1,7 @@
 IMAGES = ball.png bar.png bar_shad_above.png bar_shad_below.png \
          bg.png crosshair.png e_logo.png evas_logo.png shadow.png
 
-imgdir = $(pkgdatadir)/data/images
+imgdir = $(pkgdatadir)/images
 img_DATA = $(IMAGES)
 
 EXTRA_DIST = $(IMAGES)
diff --git a/legacy/ecore/data/pointers/Makefile.am b/legacy/ecore/data/pointers/Makefile.am
index 0d5b60a69b..05e37432a8 100644
--- a/legacy/ecore/data/pointers/Makefile.am
+++ b/legacy/ecore/data/pointers/Makefile.am
@@ -1,6 +1,6 @@
 POINTERS = mouse_pointer.png
 
-pntrdir = $(pkgdatadir)/data/pointers
+pntrdir = $(pkgdatadir)/pointers
 pntr_DATA = $(POINTERS)
 
 EXTRA_DIST = $(POINTERS)
diff --git a/legacy/ecore/src/bin/ecore_evas_test.h b/legacy/ecore/src/bin/ecore_evas_test.h
index 6440705507..f0b996278d 100644
--- a/legacy/ecore/src/bin/ecore_evas_test.h
+++ b/legacy/ecore/src/bin/ecore_evas_test.h
@@ -9,9 +9,9 @@
 #include "Ecore_Evas.h"
 #include "Ecore_Fb.h"
 
-#define IM PACKAGE_DATA_DIR"/data/images/"
-#define PT PACKAGE_DATA_DIR"/data/pointers/"
-#define FN PACKAGE_DATA_DIR"/data/fonts/"
+#define IM PACKAGE_DATA_DIR"/images/"
+#define PT PACKAGE_DATA_DIR"/pointers/"
+#define FN PACKAGE_DATA_DIR"/fonts/"
 
 extern double       start_time;
 extern Ecore_Evas  *ee;