[yelp-xsl] Moving icons to yelp-xsl installation directory

[Shaun McCance <shaunm src gnome org>]

commit 7e0802525696704edccf70112d072e4f4bb2724a
Author: Shaun McCance <shaunm gnome org>
Date:   Sat Jan 2 15:35:34 2010 -0600

    Moving icons to yelp-xsl installation directory

 Makefile.am                                        |    2 +-
 configure.in                                       |   16 +++++++---------
 data/icons/hicolor/Makefile.am                     |    1 -
 {data/icons => icons}/Makefile.am                  |    0
 {data/icons => icons}/hicolor/24x24/admon-bug.png  |  Bin 1317 -> 1317 bytes
 .../hicolor/24x24/admon-caution.png                |  Bin 1149 -> 1149 bytes
 .../hicolor/24x24/admon-important.png              |  Bin 1017 -> 1017 bytes
 {data/icons => icons}/hicolor/24x24/admon-note.png |  Bin 779 -> 779 bytes
 {data/icons => icons}/hicolor/24x24/admon-tip.png  |  Bin 1128 -> 1128 bytes
 .../hicolor/24x24/admon-warning.png                |  Bin 1149 -> 1149 bytes
 {data/icons => icons}/hicolor/48x48/Makefile.am    |    0
 .../hicolor/48x48/status/Makefile.am               |    2 +-
 .../hicolor/48x48/status/admon-bug.png             |  Bin 2952 -> 2952 bytes
 .../hicolor/48x48/status/admon-caution.png         |  Bin 2959 -> 2959 bytes
 .../hicolor/48x48/status/admon-important.png       |  Bin 2454 -> 2454 bytes
 .../hicolor/48x48/status/admon-note.png            |  Bin 1733 -> 1733 bytes
 .../hicolor/48x48/status/admon-tip.png             |  Bin 2491 -> 2491 bytes
 .../hicolor/48x48/status/admon-warning.png         |  Bin 2959 -> 2959 bytes
 icons/hicolor/Makefile.am                          |    1 +
 {data/icons => icons}/hicolor/scalable/Makefile.am |    0
 .../hicolor/scalable/status/Makefile.am            |    2 +-
 .../hicolor/scalable/status/admon-bug-shadow.svg   |    0
 .../hicolor/scalable/status/admon-bug.svg          |    0
 .../scalable/status/admon-caution-shadow.svg       |    0
 .../hicolor/scalable/status/admon-caution.svg      |    0
 .../scalable/status/admon-important-shadow.svg     |    0
 .../hicolor/scalable/status/admon-important.svg    |    0
 .../hicolor/scalable/status/admon-note-shadow.svg  |    0
 .../hicolor/scalable/status/admon-note.svg         |    0
 .../hicolor/scalable/status/admon-tip-shadow.svg   |    0
 .../hicolor/scalable/status/admon-tip.svg          |    0
 .../scalable/status/admon-warning-shadow.svg       |    0
 .../hicolor/scalable/status/admon-warning.svg      |    0
 {data => icons/hicolor}/watermarks/Makefile.am     |    2 +-
 .../watermarks/watermark-blockquote-00AB.png       |  Bin 992 -> 992 bytes
 .../watermarks/watermark-blockquote-00BB.png       |  Bin 1027 -> 1027 bytes
 .../watermarks/watermark-blockquote-201C.png       |  Bin 1102 -> 1102 bytes
 .../watermarks/watermark-blockquote-201D.png       |  Bin 1093 -> 1093 bytes
 .../watermarks/watermark-blockquote-201E.png       |  Bin 1106 -> 1106 bytes
 .../hicolor}/watermarks/watermark-blockquote.xcf   |  Bin 13622 -> 13622 bytes
 .../hicolor}/watermarks/watermark-code-python.png  |  Bin 12188 -> 12188 bytes
 .../hicolor}/watermarks/watermark-code-python.svg  |    0
 .../hicolor}/watermarks/watermark-code.png         |  Bin 19526 -> 19526 bytes
 yelp-xsl.pc.in                                     |    2 +-
 44 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3ccdab9..5fc15f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data xslt doc po
+SUBDIRS = icons xslt doc po
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.in b/configure.in
index 9654b5b..dddf763 100644
--- a/configure.in
+++ b/configure.in
@@ -38,15 +38,13 @@ AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" != "xno")
 AC_CONFIG_FILES([
 Makefile
 yelp-xsl.pc
-data/Makefile
-data/icons/Makefile
-data/icons/hicolor/Makefile
-data/icons/hicolor/48x48/Makefile
-data/icons/hicolor/48x48/status/Makefile
-data/icons/hicolor/scalable/Makefile
-data/icons/hicolor/scalable/status/Makefile
-data/templates/Makefile
-data/watermarks/Makefile
+icons/Makefile
+icons/hicolor/Makefile
+icons/hicolor/48x48/Makefile
+icons/hicolor/48x48/status/Makefile
+icons/hicolor/scalable/Makefile
+icons/hicolor/scalable/status/Makefile
+icons/hicolor/watermarks/Makefile
 doc/Makefile
 doc/yelp-xsl/Makefile
 po/Makefile.in
diff --git a/data/icons/Makefile.am b/icons/Makefile.am
similarity index 100%
rename from data/icons/Makefile.am
rename to icons/Makefile.am
diff --git a/data/icons/hicolor/24x24/admon-bug.png b/icons/hicolor/24x24/admon-bug.png
similarity index 100%
rename from data/icons/hicolor/24x24/admon-bug.png
rename to icons/hicolor/24x24/admon-bug.png
diff --git a/data/icons/hicolor/24x24/admon-caution.png b/icons/hicolor/24x24/admon-caution.png
similarity index 100%
rename from data/icons/hicolor/24x24/admon-caution.png
rename to icons/hicolor/24x24/admon-caution.png
diff --git a/data/icons/hicolor/24x24/admon-important.png b/icons/hicolor/24x24/admon-important.png
similarity index 100%
rename from data/icons/hicolor/24x24/admon-important.png
rename to icons/hicolor/24x24/admon-important.png
diff --git a/data/icons/hicolor/24x24/admon-note.png b/icons/hicolor/24x24/admon-note.png
similarity index 100%
rename from data/icons/hicolor/24x24/admon-note.png
rename to icons/hicolor/24x24/admon-note.png
diff --git a/data/icons/hicolor/24x24/admon-tip.png b/icons/hicolor/24x24/admon-tip.png
similarity index 100%
rename from data/icons/hicolor/24x24/admon-tip.png
rename to icons/hicolor/24x24/admon-tip.png
diff --git a/data/icons/hicolor/24x24/admon-warning.png b/icons/hicolor/24x24/admon-warning.png
similarity index 100%
rename from data/icons/hicolor/24x24/admon-warning.png
rename to icons/hicolor/24x24/admon-warning.png
diff --git a/data/icons/hicolor/48x48/Makefile.am b/icons/hicolor/48x48/Makefile.am
similarity index 100%
rename from data/icons/hicolor/48x48/Makefile.am
rename to icons/hicolor/48x48/Makefile.am
diff --git a/data/icons/hicolor/48x48/status/Makefile.am b/icons/hicolor/48x48/status/Makefile.am
similarity index 71%
rename from data/icons/hicolor/48x48/status/Makefile.am
rename to icons/hicolor/48x48/status/Makefile.am
index e63fa94..66fe358 100644
--- a/data/icons/hicolor/48x48/status/Makefile.am
+++ b/icons/hicolor/48x48/status/Makefile.am
@@ -1,4 +1,4 @@
-icondir = $(datadir)/gnome-doc-utils/icons/hicolor/48x48/status
+icondir = $(datadir)/yelp-xsl/icons/hicolor/48x48/status
 icon_DATA =			\
 	admon-bug.png		\
 	admon-caution.png	\
diff --git a/data/icons/hicolor/48x48/status/admon-bug.png b/icons/hicolor/48x48/status/admon-bug.png
similarity index 100%
rename from data/icons/hicolor/48x48/status/admon-bug.png
rename to icons/hicolor/48x48/status/admon-bug.png
diff --git a/data/icons/hicolor/48x48/status/admon-caution.png b/icons/hicolor/48x48/status/admon-caution.png
similarity index 100%
rename from data/icons/hicolor/48x48/status/admon-caution.png
rename to icons/hicolor/48x48/status/admon-caution.png
diff --git a/data/icons/hicolor/48x48/status/admon-important.png b/icons/hicolor/48x48/status/admon-important.png
similarity index 100%
rename from data/icons/hicolor/48x48/status/admon-important.png
rename to icons/hicolor/48x48/status/admon-important.png
diff --git a/data/icons/hicolor/48x48/status/admon-note.png b/icons/hicolor/48x48/status/admon-note.png
similarity index 100%
rename from data/icons/hicolor/48x48/status/admon-note.png
rename to icons/hicolor/48x48/status/admon-note.png
diff --git a/data/icons/hicolor/48x48/status/admon-tip.png b/icons/hicolor/48x48/status/admon-tip.png
similarity index 100%
rename from data/icons/hicolor/48x48/status/admon-tip.png
rename to icons/hicolor/48x48/status/admon-tip.png
diff --git a/data/icons/hicolor/48x48/status/admon-warning.png b/icons/hicolor/48x48/status/admon-warning.png
similarity index 100%
rename from data/icons/hicolor/48x48/status/admon-warning.png
rename to icons/hicolor/48x48/status/admon-warning.png
diff --git a/icons/hicolor/Makefile.am b/icons/hicolor/Makefile.am
new file mode 100644
index 0000000..3469565
--- /dev/null
+++ b/icons/hicolor/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = 48x48 scalable watermarks
diff --git a/data/icons/hicolor/scalable/Makefile.am b/icons/hicolor/scalable/Makefile.am
similarity index 100%
rename from data/icons/hicolor/scalable/Makefile.am
rename to icons/hicolor/scalable/Makefile.am
diff --git a/data/icons/hicolor/scalable/status/Makefile.am b/icons/hicolor/scalable/status/Makefile.am
similarity index 70%
rename from data/icons/hicolor/scalable/status/Makefile.am
rename to icons/hicolor/scalable/status/Makefile.am
index bbdad20..a00fdc3 100644
--- a/data/icons/hicolor/scalable/status/Makefile.am
+++ b/icons/hicolor/scalable/status/Makefile.am
@@ -1,4 +1,4 @@
-icondir = $(datadir)/gnome-doc-utils/icons/hicolor/scalable/status
+icondir = $(datadir)/yelp-xsl/icons/hicolor/scalable/status
 icon_DATA =			\
 	admon-caution.svg	\
 	admon-bug.svg		\
diff --git a/data/icons/hicolor/scalable/status/admon-bug-shadow.svg b/icons/hicolor/scalable/status/admon-bug-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-bug-shadow.svg
rename to icons/hicolor/scalable/status/admon-bug-shadow.svg
diff --git a/data/icons/hicolor/scalable/status/admon-bug.svg b/icons/hicolor/scalable/status/admon-bug.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-bug.svg
rename to icons/hicolor/scalable/status/admon-bug.svg
diff --git a/data/icons/hicolor/scalable/status/admon-caution-shadow.svg b/icons/hicolor/scalable/status/admon-caution-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-caution-shadow.svg
rename to icons/hicolor/scalable/status/admon-caution-shadow.svg
diff --git a/data/icons/hicolor/scalable/status/admon-caution.svg b/icons/hicolor/scalable/status/admon-caution.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-caution.svg
rename to icons/hicolor/scalable/status/admon-caution.svg
diff --git a/data/icons/hicolor/scalable/status/admon-important-shadow.svg b/icons/hicolor/scalable/status/admon-important-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-important-shadow.svg
rename to icons/hicolor/scalable/status/admon-important-shadow.svg
diff --git a/data/icons/hicolor/scalable/status/admon-important.svg b/icons/hicolor/scalable/status/admon-important.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-important.svg
rename to icons/hicolor/scalable/status/admon-important.svg
diff --git a/data/icons/hicolor/scalable/status/admon-note-shadow.svg b/icons/hicolor/scalable/status/admon-note-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-note-shadow.svg
rename to icons/hicolor/scalable/status/admon-note-shadow.svg
diff --git a/data/icons/hicolor/scalable/status/admon-note.svg b/icons/hicolor/scalable/status/admon-note.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-note.svg
rename to icons/hicolor/scalable/status/admon-note.svg
diff --git a/data/icons/hicolor/scalable/status/admon-tip-shadow.svg b/icons/hicolor/scalable/status/admon-tip-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-tip-shadow.svg
rename to icons/hicolor/scalable/status/admon-tip-shadow.svg
diff --git a/data/icons/hicolor/scalable/status/admon-tip.svg b/icons/hicolor/scalable/status/admon-tip.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-tip.svg
rename to icons/hicolor/scalable/status/admon-tip.svg
diff --git a/data/icons/hicolor/scalable/status/admon-warning-shadow.svg b/icons/hicolor/scalable/status/admon-warning-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-warning-shadow.svg
rename to icons/hicolor/scalable/status/admon-warning-shadow.svg
diff --git a/data/icons/hicolor/scalable/status/admon-warning.svg b/icons/hicolor/scalable/status/admon-warning.svg
similarity index 100%
rename from data/icons/hicolor/scalable/status/admon-warning.svg
rename to icons/hicolor/scalable/status/admon-warning.svg
diff --git a/data/watermarks/Makefile.am b/icons/hicolor/watermarks/Makefile.am
similarity index 84%
rename from data/watermarks/Makefile.am
rename to icons/hicolor/watermarks/Makefile.am
index 8fd8f74..9959395 100644
--- a/data/watermarks/Makefile.am
+++ b/icons/hicolor/watermarks/Makefile.am
@@ -1,4 +1,4 @@
-watermarkdir = $(datadir)/gnome-doc-utils/watermarks
+watermarkdir = $(datadir)/yelp-xsl/icons/hicolor/watermarks
 watermark_DATA =			\
 	watermark-blockquote-00AB.png	\
 	watermark-blockquote-00BB.png	\
diff --git a/data/watermarks/watermark-blockquote-00AB.png b/icons/hicolor/watermarks/watermark-blockquote-00AB.png
similarity index 100%
rename from data/watermarks/watermark-blockquote-00AB.png
rename to icons/hicolor/watermarks/watermark-blockquote-00AB.png
diff --git a/data/watermarks/watermark-blockquote-00BB.png b/icons/hicolor/watermarks/watermark-blockquote-00BB.png
similarity index 100%
rename from data/watermarks/watermark-blockquote-00BB.png
rename to icons/hicolor/watermarks/watermark-blockquote-00BB.png
diff --git a/data/watermarks/watermark-blockquote-201C.png b/icons/hicolor/watermarks/watermark-blockquote-201C.png
similarity index 100%
rename from data/watermarks/watermark-blockquote-201C.png
rename to icons/hicolor/watermarks/watermark-blockquote-201C.png
diff --git a/data/watermarks/watermark-blockquote-201D.png b/icons/hicolor/watermarks/watermark-blockquote-201D.png
similarity index 100%
rename from data/watermarks/watermark-blockquote-201D.png
rename to icons/hicolor/watermarks/watermark-blockquote-201D.png
diff --git a/data/watermarks/watermark-blockquote-201E.png b/icons/hicolor/watermarks/watermark-blockquote-201E.png
similarity index 100%
rename from data/watermarks/watermark-blockquote-201E.png
rename to icons/hicolor/watermarks/watermark-blockquote-201E.png
diff --git a/data/watermarks/watermark-blockquote.xcf b/icons/hicolor/watermarks/watermark-blockquote.xcf
similarity index 100%
rename from data/watermarks/watermark-blockquote.xcf
rename to icons/hicolor/watermarks/watermark-blockquote.xcf
diff --git a/data/watermarks/watermark-code-python.png b/icons/hicolor/watermarks/watermark-code-python.png
similarity index 100%
rename from data/watermarks/watermark-code-python.png
rename to icons/hicolor/watermarks/watermark-code-python.png
diff --git a/data/watermarks/watermark-code-python.svg b/icons/hicolor/watermarks/watermark-code-python.svg
similarity index 100%
rename from data/watermarks/watermark-code-python.svg
rename to icons/hicolor/watermarks/watermark-code-python.svg
diff --git a/data/watermarks/watermark-code.png b/icons/hicolor/watermarks/watermark-code.png
similarity index 100%
rename from data/watermarks/watermark-code.png
rename to icons/hicolor/watermarks/watermark-code.png
diff --git a/yelp-xsl.pc.in b/yelp-xsl.pc.in
index 990b845..d88a23a 100644
--- a/yelp-xsl.pc.in
+++ b/yelp-xsl.pc.in
@@ -1,7 +1,7 @@
 prefix= prefix@
 datarootdir= datarootdir@
 datadir= datadir@
-icondir=${datadir}/gnome-doc-utils/icons
+icondir=${datadir}/yelp-xsl/icons
 xsltdir=${datadir}/yelp-xsl/xslt
 gettext=${xsltdir}/gettext/gettext.xsl
 db2html=${xsltdir}/docbook/html/db2html.xsl