From 3040356339d5286107d4e03f45725d014c66ce65 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Mon, 11 Sep 2006 09:36:32 +0000
Subject: [PATCH] add system icons dir for e, patches for evas.

SVN revision: 25715
---
 configure.in                 |   1 +
 data/Makefile.am             |  12 +++++++++++-
 data/icons/Makefile.am       |   6 ++++++
 data/icons/images/.cvsignore |   1 -
 data/icons/xterm.png         | Bin 0 -> 2747 bytes
 src/bin/e_main.c             |   2 +-
 6 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 data/icons/Makefile.am
 delete mode 100644 data/icons/images/.cvsignore
 create mode 100644 data/icons/xterm.png

diff --git a/configure.in b/configure.in
index 1d8ca1208..aee5f39e7 100644
--- a/configure.in
+++ b/configure.in
@@ -293,6 +293,7 @@ data/xsession/Makefile
 data/xsession/enlightenment.desktop
 data/backgrounds/Makefile
 data/etc/Makefile
+data/icons/Makefile
 doc/Makefile
 po/Makefile
 intl/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 99cfb88b2..66393a596 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,13 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = fonts images init themes other xsession input_methods backgrounds etc
+SUBDIRS = \
+fonts \
+images \
+init \
+themes \
+other \
+xsession \
+input_methods \
+backgrounds \
+etc \
+icons
 
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 000000000..1a9c06571
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,6 @@
+MAINTAINERCLEANFILES = Makefile.in
+filesdir = $(datadir)/enlightenment/data/icons
+files_DATA = \
+xterm.png
+
+EXTRA_DIST = $(files_DATA)
diff --git a/data/icons/images/.cvsignore b/data/icons/images/.cvsignore
deleted file mode 100644
index 70845e08e..000000000
--- a/data/icons/images/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.in
diff --git a/data/icons/xterm.png b/data/icons/xterm.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0db689c43f4b6e741af4ba293249f04432545c4
GIT binary patch
literal 2747
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
BP1yhd

literal 0
HcmV?d00001

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index dc5a74131..f6954be06 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -384,7 +384,7 @@ main(int argc, char **argv)
 
    ecore_desktop_paths_extras_clear();
    ecore_desktop_paths_prepend_user(ECORE_DESKTOP_PATHS_ICONS, "~/.e/e/icons");
-   snprintf(buf, sizeof(buf), "%s/data/images", e_prefix_data_get());
+   snprintf(buf, sizeof(buf), "%s/data/icons", e_prefix_data_get());
    ecore_desktop_paths_append_system(ECORE_DESKTOP_PATHS_ICONS, buf);
    ecore_desktop_paths_regen();