44 files changed, 13 insertions, 15 deletions

diff --git a/Makefile.am b/Makefile.am
index 3ccdab99..5fc15f1c 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 9654b5b7..dddf763e 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/hicolor/Makefile.am b/data/icons/hicolor/Makefile.am
deleted file mode 100644
index 637e85bc..00000000
--- a/data/icons/hicolor/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = 48x48 scalable
diff --git a/data/icons/Makefile.am b/icons/Makefile.am
index 658356b2..658356b2 100644
--- a/data/icons/Makefile.am
+++ b/icons/Makefile.am
diff --git a/data/icons/hicolor/24x24/admon-bug.png b/icons/hicolor/24x24/admon-bug.png
index a091d3d1..a091d3d1 100644
--- a/data/icons/hicolor/24x24/admon-bug.png
+++ b/icons/hicolor/24x24/admon-bug.png
diff --git a/data/icons/hicolor/24x24/admon-caution.png b/icons/hicolor/24x24/admon-caution.png
index 04395e6c..04395e6c 100644
--- a/data/icons/hicolor/24x24/admon-caution.png
+++ b/icons/hicolor/24x24/admon-caution.png
diff --git a/data/icons/hicolor/24x24/admon-important.png b/icons/hicolor/24x24/admon-important.png
index ec5a6787..ec5a6787 100644
--- a/data/icons/hicolor/24x24/admon-important.png
+++ b/icons/hicolor/24x24/admon-important.png
diff --git a/data/icons/hicolor/24x24/admon-note.png b/icons/hicolor/24x24/admon-note.png
index c8827591..c8827591 100644
--- a/data/icons/hicolor/24x24/admon-note.png
+++ b/icons/hicolor/24x24/admon-note.png
diff --git a/data/icons/hicolor/24x24/admon-tip.png b/icons/hicolor/24x24/admon-tip.png
index 00d4f9c3..00d4f9c3 100644
--- a/data/icons/hicolor/24x24/admon-tip.png
+++ b/icons/hicolor/24x24/admon-tip.png
diff --git a/data/icons/hicolor/24x24/admon-warning.png b/icons/hicolor/24x24/admon-warning.png
index 04395e6c..04395e6c 100644
--- a/data/icons/hicolor/24x24/admon-warning.png
+++ b/icons/hicolor/24x24/admon-warning.png
diff --git a/data/icons/hicolor/48x48/Makefile.am b/icons/hicolor/48x48/Makefile.am
index d52da2b9..d52da2b9 100644
--- a/data/icons/hicolor/48x48/Makefile.am
+++ b/icons/hicolor/48x48/Makefile.am
diff --git a/data/icons/hicolor/48x48/status/Makefile.am b/icons/hicolor/48x48/status/Makefile.am
index e63fa94b..66fe3586 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
index aea64469..aea64469 100644
--- a/data/icons/hicolor/48x48/status/admon-bug.png
+++ b/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
index ecdc0f92..ecdc0f92 100644
--- a/data/icons/hicolor/48x48/status/admon-caution.png
+++ b/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
index cc85f533..cc85f533 100644
--- a/data/icons/hicolor/48x48/status/admon-important.png
+++ b/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
index 4ffa19c7..4ffa19c7 100644
--- a/data/icons/hicolor/48x48/status/admon-note.png
+++ b/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
index a25faae6..a25faae6 100644
--- a/data/icons/hicolor/48x48/status/admon-tip.png
+++ b/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
index ecdc0f92..ecdc0f92 100644
--- a/data/icons/hicolor/48x48/status/admon-warning.png
+++ b/icons/hicolor/48x48/status/admon-warning.png
diff --git a/icons/hicolor/Makefile.am b/icons/hicolor/Makefile.am
new file mode 100644
index 00000000..34695651
--- /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
index d52da2b9..d52da2b9 100644
--- a/data/icons/hicolor/scalable/Makefile.am
+++ b/icons/hicolor/scalable/Makefile.am
diff --git a/data/icons/hicolor/scalable/status/Makefile.am b/icons/hicolor/scalable/status/Makefile.am
index bbdad204..a00fdc38 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
index 24083e82..24083e82 100644
--- a/data/icons/hicolor/scalable/status/admon-bug-shadow.svg
+++ b/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
index 744383ad..744383ad 100644
--- a/data/icons/hicolor/scalable/status/admon-bug.svg
+++ b/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
index ddf7e45b..ddf7e45b 100644
--- a/data/icons/hicolor/scalable/status/admon-caution-shadow.svg
+++ b/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
index d62f581b..d62f581b 100644
--- a/data/icons/hicolor/scalable/status/admon-caution.svg
+++ b/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
index bfe9d001..bfe9d001 100644
--- a/data/icons/hicolor/scalable/status/admon-important-shadow.svg
+++ b/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
index f71348ad..f71348ad 100644
--- a/data/icons/hicolor/scalable/status/admon-important.svg
+++ b/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
index 340263c3..340263c3 100644
--- a/data/icons/hicolor/scalable/status/admon-note-shadow.svg
+++ b/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
index ded81a26..ded81a26 100644
--- a/data/icons/hicolor/scalable/status/admon-note.svg
+++ b/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
index 5751f9e4..5751f9e4 100644
--- a/data/icons/hicolor/scalable/status/admon-tip-shadow.svg
+++ b/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
index 6fc50f87..6fc50f87 100644
--- a/data/icons/hicolor/scalable/status/admon-tip.svg
+++ b/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
index ddf7e45b..ddf7e45b 100644
--- a/data/icons/hicolor/scalable/status/admon-warning-shadow.svg
+++ b/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
index d62f581b..d62f581b 100644
--- a/data/icons/hicolor/scalable/status/admon-warning.svg
+++ b/icons/hicolor/scalable/status/admon-warning.svg
diff --git a/data/watermarks/Makefile.am b/icons/hicolor/watermarks/Makefile.am
index 8fd8f741..99593953 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
index 22495c64..22495c64 100644
--- a/data/watermarks/watermark-blockquote-00AB.png
+++ b/icons/hicolor/watermarks/watermark-blockquote-00AB.png
diff --git a/data/watermarks/watermark-blockquote-00BB.png b/icons/hicolor/watermarks/watermark-blockquote-00BB.png
index a003624d..a003624d 100644
--- a/data/watermarks/watermark-blockquote-00BB.png
+++ b/icons/hicolor/watermarks/watermark-blockquote-00BB.png
diff --git a/data/watermarks/watermark-blockquote-201C.png b/icons/hicolor/watermarks/watermark-blockquote-201C.png
index f134ad9b..f134ad9b 100644
--- a/data/watermarks/watermark-blockquote-201C.png
+++ b/icons/hicolor/watermarks/watermark-blockquote-201C.png
diff --git a/data/watermarks/watermark-blockquote-201D.png b/icons/hicolor/watermarks/watermark-blockquote-201D.png
index 2e9b6958..2e9b6958 100644
--- a/data/watermarks/watermark-blockquote-201D.png
+++ b/icons/hicolor/watermarks/watermark-blockquote-201D.png
diff --git a/data/watermarks/watermark-blockquote-201E.png b/icons/hicolor/watermarks/watermark-blockquote-201E.png
index 33bd5631..33bd5631 100644
--- a/data/watermarks/watermark-blockquote-201E.png
+++ b/icons/hicolor/watermarks/watermark-blockquote-201E.png
diff --git a/data/watermarks/watermark-blockquote.xcf b/icons/hicolor/watermarks/watermark-blockquote.xcf
index 5543e378..5543e378 100644
--- a/data/watermarks/watermark-blockquote.xcf
+++ b/icons/hicolor/watermarks/watermark-blockquote.xcf
diff --git a/data/watermarks/watermark-code-python.png b/icons/hicolor/watermarks/watermark-code-python.png
index 0e42c10e..0e42c10e 100644
--- a/data/watermarks/watermark-code-python.png
+++ b/icons/hicolor/watermarks/watermark-code-python.png
diff --git a/data/watermarks/watermark-code-python.svg b/icons/hicolor/watermarks/watermark-code-python.svg
index 9bc87572..9bc87572 100644
--- a/data/watermarks/watermark-code-python.svg
+++ b/icons/hicolor/watermarks/watermark-code-python.svg
diff --git a/data/watermarks/watermark-code.png b/icons/hicolor/watermarks/watermark-code.png
index 75918d24..75918d24 100644
--- a/data/watermarks/watermark-code.png
+++ b/icons/hicolor/watermarks/watermark-code.png
diff --git a/yelp-xsl.pc.in b/yelp-xsl.pc.in
index 990b845f..d88a23ad 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