diff options
author | Shaun McCance <shaunm@gnome.org> | 2010-01-02 15:35:34 -0600 |
---|---|---|
committer | Shaun McCance <shaunm@gnome.org> | 2010-01-02 15:35:34 -0600 |
commit | 7e0802525696704edccf70112d072e4f4bb2724a (patch) | |
tree | f3ea5d5ad47beb175b8fc2ba83aec28aae669de3 | |
parent | 26ae8cc874e46e265ded319315a3e7a9e1ab213e (diff) | |
download | yelp-xsl-7e0802525696704edccf70112d072e4f4bb2724a.tar.gz |
Moving icons to yelp-xsl installation directory
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | configure.in | 16 | ||||
-rw-r--r-- | data/icons/hicolor/Makefile.am | 1 | ||||
-rw-r--r-- | icons/Makefile.am (renamed from data/icons/Makefile.am) | 0 | ||||
-rw-r--r-- | icons/hicolor/24x24/admon-bug.png (renamed from data/icons/hicolor/24x24/admon-bug.png) | bin | 1317 -> 1317 bytes | |||
-rw-r--r-- | icons/hicolor/24x24/admon-caution.png (renamed from data/icons/hicolor/24x24/admon-caution.png) | bin | 1149 -> 1149 bytes | |||
-rw-r--r-- | icons/hicolor/24x24/admon-important.png (renamed from data/icons/hicolor/24x24/admon-important.png) | bin | 1017 -> 1017 bytes | |||
-rw-r--r-- | icons/hicolor/24x24/admon-note.png (renamed from data/icons/hicolor/24x24/admon-note.png) | bin | 779 -> 779 bytes | |||
-rw-r--r-- | icons/hicolor/24x24/admon-tip.png (renamed from data/icons/hicolor/24x24/admon-tip.png) | bin | 1128 -> 1128 bytes | |||
-rw-r--r-- | icons/hicolor/24x24/admon-warning.png (renamed from data/icons/hicolor/24x24/admon-warning.png) | bin | 1149 -> 1149 bytes | |||
-rw-r--r-- | icons/hicolor/48x48/Makefile.am (renamed from data/icons/hicolor/48x48/Makefile.am) | 0 | ||||
-rw-r--r-- | icons/hicolor/48x48/status/Makefile.am (renamed from data/icons/hicolor/48x48/status/Makefile.am) | 2 | ||||
-rw-r--r-- | icons/hicolor/48x48/status/admon-bug.png (renamed from data/icons/hicolor/48x48/status/admon-bug.png) | bin | 2952 -> 2952 bytes | |||
-rw-r--r-- | icons/hicolor/48x48/status/admon-caution.png (renamed from data/icons/hicolor/48x48/status/admon-caution.png) | bin | 2959 -> 2959 bytes | |||
-rw-r--r-- | icons/hicolor/48x48/status/admon-important.png (renamed from data/icons/hicolor/48x48/status/admon-important.png) | bin | 2454 -> 2454 bytes | |||
-rw-r--r-- | icons/hicolor/48x48/status/admon-note.png (renamed from data/icons/hicolor/48x48/status/admon-note.png) | bin | 1733 -> 1733 bytes | |||
-rw-r--r-- | icons/hicolor/48x48/status/admon-tip.png (renamed from data/icons/hicolor/48x48/status/admon-tip.png) | bin | 2491 -> 2491 bytes | |||
-rw-r--r-- | icons/hicolor/48x48/status/admon-warning.png (renamed from data/icons/hicolor/48x48/status/admon-warning.png) | bin | 2959 -> 2959 bytes | |||
-rw-r--r-- | icons/hicolor/Makefile.am | 1 | ||||
-rw-r--r-- | icons/hicolor/scalable/Makefile.am (renamed from data/icons/hicolor/scalable/Makefile.am) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/Makefile.am (renamed from data/icons/hicolor/scalable/status/Makefile.am) | 2 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-bug-shadow.svg (renamed from data/icons/hicolor/scalable/status/admon-bug-shadow.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-bug.svg (renamed from data/icons/hicolor/scalable/status/admon-bug.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-caution-shadow.svg (renamed from data/icons/hicolor/scalable/status/admon-caution-shadow.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-caution.svg (renamed from data/icons/hicolor/scalable/status/admon-caution.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-important-shadow.svg (renamed from data/icons/hicolor/scalable/status/admon-important-shadow.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-important.svg (renamed from data/icons/hicolor/scalable/status/admon-important.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-note-shadow.svg (renamed from data/icons/hicolor/scalable/status/admon-note-shadow.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-note.svg (renamed from data/icons/hicolor/scalable/status/admon-note.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-tip-shadow.svg (renamed from data/icons/hicolor/scalable/status/admon-tip-shadow.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-tip.svg (renamed from data/icons/hicolor/scalable/status/admon-tip.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-warning-shadow.svg (renamed from data/icons/hicolor/scalable/status/admon-warning-shadow.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/scalable/status/admon-warning.svg (renamed from data/icons/hicolor/scalable/status/admon-warning.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/watermarks/Makefile.am (renamed from data/watermarks/Makefile.am) | 2 | ||||
-rw-r--r-- | icons/hicolor/watermarks/watermark-blockquote-00AB.png (renamed from data/watermarks/watermark-blockquote-00AB.png) | bin | 992 -> 992 bytes | |||
-rw-r--r-- | icons/hicolor/watermarks/watermark-blockquote-00BB.png (renamed from data/watermarks/watermark-blockquote-00BB.png) | bin | 1027 -> 1027 bytes | |||
-rw-r--r-- | icons/hicolor/watermarks/watermark-blockquote-201C.png (renamed from data/watermarks/watermark-blockquote-201C.png) | bin | 1102 -> 1102 bytes | |||
-rw-r--r-- | icons/hicolor/watermarks/watermark-blockquote-201D.png (renamed from data/watermarks/watermark-blockquote-201D.png) | bin | 1093 -> 1093 bytes | |||
-rw-r--r-- | icons/hicolor/watermarks/watermark-blockquote-201E.png (renamed from data/watermarks/watermark-blockquote-201E.png) | bin | 1106 -> 1106 bytes | |||
-rw-r--r-- | icons/hicolor/watermarks/watermark-blockquote.xcf (renamed from data/watermarks/watermark-blockquote.xcf) | bin | 13622 -> 13622 bytes | |||
-rw-r--r-- | icons/hicolor/watermarks/watermark-code-python.png (renamed from data/watermarks/watermark-code-python.png) | bin | 12188 -> 12188 bytes | |||
-rw-r--r-- | icons/hicolor/watermarks/watermark-code-python.svg (renamed from data/watermarks/watermark-code-python.svg) | 0 | ||||
-rw-r--r-- | icons/hicolor/watermarks/watermark-code.png (renamed from data/watermarks/watermark-code.png) | bin | 19526 -> 19526 bytes | |||
-rw-r--r-- | yelp-xsl.pc.in | 2 |
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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 |