From c424013fdd0fe24a088d629dbe22b338923b61db Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Tue, 3 Jan 2006 19:33:57 +0000 Subject: Disable the checks for hicolor, as we no longer install icons into the 2006-01-03 Rodney Dawes * Makefile.am: * configure.in: Disable the checks for hicolor, as we no longer install icons into the hicolor theme, with this commit * */*/Makefile.am: Don't install gnome icons to hicolor, to avoid the possibility for conflicts, when we move all the gnome icons over to the Icon Naming Specification names --- 16x16/apps/Makefile.am | 2 +- 16x16/stock/chart/Makefile.am | 2 +- 16x16/stock/code/Makefile.am | 2 +- 16x16/stock/data/Makefile.am | 2 +- 16x16/stock/document/Makefile.am | 2 +- 16x16/stock/flag/Makefile.am | 2 +- 16x16/stock/form/Makefile.am | 2 +- 16x16/stock/generic/Makefile.am | 2 +- 16x16/stock/image/Makefile.am | 2 +- 16x16/stock/io/Makefile.am | 2 +- 16x16/stock/navigation/Makefile.am | 2 +- 16x16/stock/net/Makefile.am | 2 +- 16x16/stock/object/Makefile.am | 2 +- 16x16/stock/table/Makefile.am | 2 +- 16x16/stock/text/Makefile.am | 2 +- 192x192/apps/Makefile.am | 2 +- 24x24/apps/Makefile.am | 2 +- 24x24/stock/chart/Makefile.am | 2 +- 24x24/stock/code/Makefile.am | 2 +- 24x24/stock/data/Makefile.am | 2 +- 24x24/stock/document/Makefile.am | 2 +- 24x24/stock/form/Makefile.am | 2 +- 24x24/stock/generic/Makefile.am | 2 +- 24x24/stock/image/Makefile.am | 2 +- 24x24/stock/io/Makefile.am | 2 +- 24x24/stock/navigation/Makefile.am | 2 +- 24x24/stock/net/Makefile.am | 2 +- 24x24/stock/object/Makefile.am | 2 +- 24x24/stock/table/Makefile.am | 2 +- 24x24/stock/text/Makefile.am | 2 +- 32x32/apps/Makefile.am | 2 +- 32x32/stock/chart/Makefile.am | 2 +- 32x32/stock/code/Makefile.am | 2 +- 32x32/stock/data/Makefile.am | 2 +- 32x32/stock/document/Makefile.am | 2 +- 32x32/stock/generic/Makefile.am | 2 +- 32x32/stock/io/Makefile.am | 2 +- 32x32/stock/net/Makefile.am | 2 +- 32x32/stock/object/Makefile.am | 2 +- 36x36/apps/Makefile.am | 2 +- 36x36/stock/document/Makefile.am | 2 +- 36x36/stock/generic/Makefile.am | 2 +- 48x48/apps/Makefile.am | 2 +- 48x48/stock/code/Makefile.am | 2 +- 48x48/stock/data/Makefile.am | 2 +- 48x48/stock/document/Makefile.am | 2 +- 48x48/stock/generic/Makefile.am | 2 +- 48x48/stock/io/Makefile.am | 2 +- 48x48/stock/net/Makefile.am | 2 +- 48x48/stock/object/Makefile.am | 2 +- 72x72/apps/Makefile.am | 2 +- 96x96/apps/Makefile.am | 2 +- ChangeLog | 10 ++++++++++ Makefile.am | 25 ------------------------- configure.in | 7 ------- scalable/apps/Makefile.am | 2 +- 56 files changed, 63 insertions(+), 85 deletions(-) diff --git a/16x16/apps/Makefile.am b/16x16/apps/Makefile.am index 30aaab74d..fbce47a90 100644 --- a/16x16/apps/Makefile.am +++ b/16x16/apps/Makefile.am @@ -2,7 +2,7 @@ NULL= iconsize=16x16 category=apps -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category) icon_DATA =\ config-language.png \ diff --git a/16x16/stock/chart/Makefile.am b/16x16/stock/chart/Makefile.am index 4ca98890a..a862222af 100644 --- a/16x16/stock/chart/Makefile.am +++ b/16x16/stock/chart/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=chart -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_chart-autoformat.png \ diff --git a/16x16/stock/code/Makefile.am b/16x16/stock/code/Makefile.am index dc17958e1..9f9c1f960 100644 --- a/16x16/stock/code/Makefile.am +++ b/16x16/stock/code/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=code -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_compile.png \ diff --git a/16x16/stock/data/Makefile.am b/16x16/stock/data/Makefile.am index dc10d5676..1194ab017 100644 --- a/16x16/stock/data/Makefile.am +++ b/16x16/stock/data/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=data -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_add-decimal-place.png \ diff --git a/16x16/stock/document/Makefile.am b/16x16/stock/document/Makefile.am index 21cf26432..05e349f42 100644 --- a/16x16/stock/document/Makefile.am +++ b/16x16/stock/document/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=document -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_attach.png \ diff --git a/16x16/stock/flag/Makefile.am b/16x16/stock/flag/Makefile.am index ca36bbd03..a3d29d0ae 100644 --- a/16x16/stock/flag/Makefile.am +++ b/16x16/stock/flag/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=flag -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ ad.png \ diff --git a/16x16/stock/form/Makefile.am b/16x16/stock/form/Makefile.am index 4da1b0547..e0a4ef00e 100644 --- a/16x16/stock/form/Makefile.am +++ b/16x16/stock/form/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=form -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_form-activation-order.png \ diff --git a/16x16/stock/generic/Makefile.am b/16x16/stock/generic/Makefile.am index b60e95c0c..13c224e45 100644 --- a/16x16/stock/generic/Makefile.am +++ b/16x16/stock/generic/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=generic -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_autocompletion.png \ diff --git a/16x16/stock/image/Makefile.am b/16x16/stock/image/Makefile.am index 1b377f0b4..5ec8b7108 100644 --- a/16x16/stock/image/Makefile.am +++ b/16x16/stock/image/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=image -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_arrowstyle.png \ diff --git a/16x16/stock/io/Makefile.am b/16x16/stock/io/Makefile.am index 9556467e2..46a463259 100644 --- a/16x16/stock/io/Makefile.am +++ b/16x16/stock/io/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=io -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_bluetooth.png \ diff --git a/16x16/stock/navigation/Makefile.am b/16x16/stock/navigation/Makefile.am index 41fbc9c49..8d609342c 100644 --- a/16x16/stock/navigation/Makefile.am +++ b/16x16/stock/navigation/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=navigation -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_bottom.png \ diff --git a/16x16/stock/net/Makefile.am b/16x16/stock/net/Makefile.am index fccd722cc..b100d4f2a 100644 --- a/16x16/stock/net/Makefile.am +++ b/16x16/stock/net/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=net -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_addressbook.png \ diff --git a/16x16/stock/object/Makefile.am b/16x16/stock/object/Makefile.am index 2f706b114..2061a8dbd 100644 --- a/16x16/stock/object/Makefile.am +++ b/16x16/stock/object/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=object -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_3d-3d-attributes-only.png \ diff --git a/16x16/stock/table/Makefile.am b/16x16/stock/table/Makefile.am index ae79ca4ea..30c62727a 100644 --- a/16x16/stock/table/Makefile.am +++ b/16x16/stock/table/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=table -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_alignment-bottom.png \ diff --git a/16x16/stock/text/Makefile.am b/16x16/stock/text/Makefile.am index c2c771e13..80947391a 100644 --- a/16x16/stock/text/Makefile.am +++ b/16x16/stock/text/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=16x16 category=stock subtype=text -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_autoformat.png \ diff --git a/192x192/apps/Makefile.am b/192x192/apps/Makefile.am index 31fd2a7bc..9371eb451 100644 --- a/192x192/apps/Makefile.am +++ b/192x192/apps/Makefile.am @@ -2,7 +2,7 @@ NULL= iconsize=192x192 category=apps -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category) icon_DATA =\ gnome-globe.png \ diff --git a/24x24/apps/Makefile.am b/24x24/apps/Makefile.am index e12702b14..7d611c2fb 100644 --- a/24x24/apps/Makefile.am +++ b/24x24/apps/Makefile.am @@ -2,7 +2,7 @@ NULL= iconsize=24x24 category=apps -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category) icon_DATA =\ accessibility-directory.png \ diff --git a/24x24/stock/chart/Makefile.am b/24x24/stock/chart/Makefile.am index 21247fac6..13eeaf77d 100644 --- a/24x24/stock/chart/Makefile.am +++ b/24x24/stock/chart/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=chart -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_chart-autoformat.png \ diff --git a/24x24/stock/code/Makefile.am b/24x24/stock/code/Makefile.am index a1e5e8892..9a25db319 100644 --- a/24x24/stock/code/Makefile.am +++ b/24x24/stock/code/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=code -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_compile.png \ diff --git a/24x24/stock/data/Makefile.am b/24x24/stock/data/Makefile.am index 983434188..6c81a550b 100644 --- a/24x24/stock/data/Makefile.am +++ b/24x24/stock/data/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=data -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_add-decimal-place.png \ diff --git a/24x24/stock/document/Makefile.am b/24x24/stock/document/Makefile.am index df32f2866..b6885e6b1 100644 --- a/24x24/stock/document/Makefile.am +++ b/24x24/stock/document/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=document -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_attach.png \ diff --git a/24x24/stock/form/Makefile.am b/24x24/stock/form/Makefile.am index 3aa6c4410..fe8a4a608 100644 --- a/24x24/stock/form/Makefile.am +++ b/24x24/stock/form/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=form -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_form-activation-order.png \ diff --git a/24x24/stock/generic/Makefile.am b/24x24/stock/generic/Makefile.am index ef0f4f3a4..eef11bb09 100644 --- a/24x24/stock/generic/Makefile.am +++ b/24x24/stock/generic/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=generic -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_about.png \ diff --git a/24x24/stock/image/Makefile.am b/24x24/stock/image/Makefile.am index d2eccbccc..e0738a56f 100644 --- a/24x24/stock/image/Makefile.am +++ b/24x24/stock/image/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=image -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_3d-color-picker.png \ diff --git a/24x24/stock/io/Makefile.am b/24x24/stock/io/Makefile.am index 83fad8a35..6fa459a82 100644 --- a/24x24/stock/io/Makefile.am +++ b/24x24/stock/io/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=io -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_bluetooth.png \ diff --git a/24x24/stock/navigation/Makefile.am b/24x24/stock/navigation/Makefile.am index 9775f666c..77e564f9a 100644 --- a/24x24/stock/navigation/Makefile.am +++ b/24x24/stock/navigation/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=navigation -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_bottom.png \ diff --git a/24x24/stock/net/Makefile.am b/24x24/stock/net/Makefile.am index 72c7acbf1..a65ca33bb 100644 --- a/24x24/stock/net/Makefile.am +++ b/24x24/stock/net/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=net -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_addressbook.png \ diff --git a/24x24/stock/object/Makefile.am b/24x24/stock/object/Makefile.am index 464c34d7c..7280647af 100644 --- a/24x24/stock/object/Makefile.am +++ b/24x24/stock/object/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=object -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_add-bookmark.png \ diff --git a/24x24/stock/table/Makefile.am b/24x24/stock/table/Makefile.am index 7cd61669c..6875e6180 100644 --- a/24x24/stock/table/Makefile.am +++ b/24x24/stock/table/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=table -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_alignment-bottom.png \ diff --git a/24x24/stock/text/Makefile.am b/24x24/stock/text/Makefile.am index 2d7d39f02..2cf5befd1 100644 --- a/24x24/stock/text/Makefile.am +++ b/24x24/stock/text/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=24x24 category=stock subtype=text -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_autoformat.png \ diff --git a/32x32/apps/Makefile.am b/32x32/apps/Makefile.am index 6c3a80d65..a56b1085f 100644 --- a/32x32/apps/Makefile.am +++ b/32x32/apps/Makefile.am @@ -2,7 +2,7 @@ NULL= iconsize=32x32 category=apps -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category) icon_DATA =\ administration.png \ diff --git a/32x32/stock/chart/Makefile.am b/32x32/stock/chart/Makefile.am index 26bde1374..807dc59a5 100644 --- a/32x32/stock/chart/Makefile.am +++ b/32x32/stock/chart/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=32x32 category=stock subtype=chart -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_chart.png \ diff --git a/32x32/stock/code/Makefile.am b/32x32/stock/code/Makefile.am index 1d256ccee..25d290eeb 100644 --- a/32x32/stock/code/Makefile.am +++ b/32x32/stock/code/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=32x32 category=stock subtype=code -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_script.png \ diff --git a/32x32/stock/data/Makefile.am b/32x32/stock/data/Makefile.am index 0575f2ae6..6f27dd95d 100644 --- a/32x32/stock/data/Makefile.am +++ b/32x32/stock/data/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=32x32 category=stock subtype=data -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_lock.png \ diff --git a/32x32/stock/document/Makefile.am b/32x32/stock/document/Makefile.am index e54351c0d..e11af310b 100644 --- a/32x32/stock/document/Makefile.am +++ b/32x32/stock/document/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=32x32 category=stock subtype=document -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_new-drawing.png \ diff --git a/32x32/stock/generic/Makefile.am b/32x32/stock/generic/Makefile.am index ab994b58b..c7ad1b524 100644 --- a/32x32/stock/generic/Makefile.am +++ b/32x32/stock/generic/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=32x32 category=stock subtype=generic -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_alarm.png \ diff --git a/32x32/stock/io/Makefile.am b/32x32/stock/io/Makefile.am index 1f8a165a4..ab997cfaf 100644 --- a/32x32/stock/io/Makefile.am +++ b/32x32/stock/io/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=32x32 category=stock subtype=io -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_bluetooth.png \ diff --git a/32x32/stock/net/Makefile.am b/32x32/stock/net/Makefile.am index da8b096c9..8b74c9dfc 100644 --- a/32x32/stock/net/Makefile.am +++ b/32x32/stock/net/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=32x32 category=stock subtype=net -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_addressbook.png \ diff --git a/32x32/stock/object/Makefile.am b/32x32/stock/object/Makefile.am index 23abcefc1..218017b2f 100644 --- a/32x32/stock/object/Makefile.am +++ b/32x32/stock/object/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=32x32 category=stock subtype=object -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_add-bookmark.png \ diff --git a/36x36/apps/Makefile.am b/36x36/apps/Makefile.am index fcb576de0..88da48bfa 100644 --- a/36x36/apps/Makefile.am +++ b/36x36/apps/Makefile.am @@ -2,7 +2,7 @@ NULL= iconsize=36x36 category=apps -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category) icon_DATA =\ gnome-spinner.png \ diff --git a/36x36/stock/document/Makefile.am b/36x36/stock/document/Makefile.am index a8621e55a..9d8c379e2 100644 --- a/36x36/stock/document/Makefile.am +++ b/36x36/stock/document/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=36x36 category=stock subtype=document -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_my-documents.png \ diff --git a/36x36/stock/generic/Makefile.am b/36x36/stock/generic/Makefile.am index 5279bcf68..220fbdd5e 100644 --- a/36x36/stock/generic/Makefile.am +++ b/36x36/stock/generic/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=36x36 category=stock subtype=generic -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_autopilot.png \ diff --git a/48x48/apps/Makefile.am b/48x48/apps/Makefile.am index 83e3a16f9..f96ce0fbe 100644 --- a/48x48/apps/Makefile.am +++ b/48x48/apps/Makefile.am @@ -2,7 +2,7 @@ NULL= iconsize=48x48 category=apps -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category) icon_DATA =\ administration.png \ diff --git a/48x48/stock/code/Makefile.am b/48x48/stock/code/Makefile.am index 9237210a6..3667b1f29 100644 --- a/48x48/stock/code/Makefile.am +++ b/48x48/stock/code/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=48x48 category=stock subtype=code -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_script.png \ diff --git a/48x48/stock/data/Makefile.am b/48x48/stock/data/Makefile.am index 8959ec825..e681c954d 100644 --- a/48x48/stock/data/Makefile.am +++ b/48x48/stock/data/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=48x48 category=stock subtype=data -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_lock.png \ diff --git a/48x48/stock/document/Makefile.am b/48x48/stock/document/Makefile.am index a0b9ac430..0393bd6ad 100644 --- a/48x48/stock/document/Makefile.am +++ b/48x48/stock/document/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=48x48 category=stock subtype=document -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_certificate.png \ diff --git a/48x48/stock/generic/Makefile.am b/48x48/stock/generic/Makefile.am index 9259b7152..d3481dd80 100644 --- a/48x48/stock/generic/Makefile.am +++ b/48x48/stock/generic/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=48x48 category=stock subtype=generic -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA = \ stock_alarm.png \ diff --git a/48x48/stock/io/Makefile.am b/48x48/stock/io/Makefile.am index 42dc6f2e7..8a110066d 100644 --- a/48x48/stock/io/Makefile.am +++ b/48x48/stock/io/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=48x48 category=stock subtype=io -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_bluetooth.png \ diff --git a/48x48/stock/net/Makefile.am b/48x48/stock/net/Makefile.am index 6f5ca3022..93159611f 100644 --- a/48x48/stock/net/Makefile.am +++ b/48x48/stock/net/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=48x48 category=stock subtype=net -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_addressbook.png \ diff --git a/48x48/stock/object/Makefile.am b/48x48/stock/object/Makefile.am index 528c28a66..b8547af54 100644 --- a/48x48/stock/object/Makefile.am +++ b/48x48/stock/object/Makefile.am @@ -3,7 +3,7 @@ NULL= iconsize=48x48 category=stock subtype=object -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category)/$(subtype) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)/$(subtype) icon_DATA =\ stock_insert-floating-frame.png \ diff --git a/72x72/apps/Makefile.am b/72x72/apps/Makefile.am index 401cdfd70..d03381514 100644 --- a/72x72/apps/Makefile.am +++ b/72x72/apps/Makefile.am @@ -2,7 +2,7 @@ NULL= iconsize=72x72 category=apps -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category) icon_DATA =\ gnome-globe.png \ diff --git a/96x96/apps/Makefile.am b/96x96/apps/Makefile.am index 11956c2ad..59807cf82 100644 --- a/96x96/apps/Makefile.am +++ b/96x96/apps/Makefile.am @@ -2,7 +2,7 @@ NULL= iconsize=96x96 category=apps -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category) icon_DATA =\ gnome-starthere.png \ diff --git a/ChangeLog b/ChangeLog index e6acb3c4d..d482869cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-01-03 Rodney Dawes + + * Makefile.am: + * configure.in: Disable the checks for hicolor, as we no longer install + icons into the hicolor theme, with this commit + + * */*/Makefile.am: Don't install gnome icons to hicolor, to avoid the + possibility for conflicts, when we move all the gnome icons over to the + Icon Naming Specification names + 2006-01-02 Rodney Dawes * NEWS: diff --git a/Makefile.am b/Makefile.am index e50ee582b..33363b6c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,11 +7,6 @@ THEME_IN_FILES=index.theme.in %.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache -hicolor_dirs = \ - $(datadir)/pixmaps \ - $(datadir)/icons \ - /usr/share/icons \ - /usr/share/pixmaps icondir = $(datadir)/icons/gnome icon_DATA = index.theme @@ -26,28 +21,8 @@ EXTRA_DIST= \ # we don't want to install mo files, all translations are already stored # in theme files -# Ensure that hicolor is installed too install-data-local: $(MAKE) -C po uninstall -if ENABLE_HICOLOR_CHECK - @dirs='$(hicolor_dirs)'; for dir in $$dirs; do \ - echo Checking for hicolor theme in \'$$dir/hicolor/index.theme\' ; \ - if test -f "$$dir/hicolor/index.theme"; then \ - echo Good. Found it. ; \ - exit 0; \ - fi ; \ - done ; \ - echo ; \ - echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" ; \ - echo "Could not find the theme 'hicolor' which acts as the base for all other" ; \ - echo "themes, including gnome-icon-theme. Perhaps you need to install it." ; \ - echo "You can get a copy from http://freedesktop.org/Software/icon-theme/releases" ; \ - echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" ; \ - echo ; \ - exit 1 -endif - -DISTCHECK_CONFIGURE_FLAGS = --disable-hicolor-check CLEANFILES = \ index.theme diff --git a/configure.in b/configure.in index 15f84298c..b76cba3f9 100644 --- a/configure.in +++ b/configure.in @@ -28,13 +28,6 @@ AC_SUBST(localedir) # Workaround to make aclocal get the right flags AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}") -AC_ARG_ENABLE(hicolor-check, - AC_HELP_STRING([--disable-hicolor-check], - [disable the check for hicolor [default=no]]), - enable_hicolor_check=$enableval, - enable_hicolor_check=yes) -AM_CONDITIONAL(ENABLE_HICOLOR_CHECK, test x$enable_hicolor_check = xyes) - AC_CONFIG_FILES([ Makefile gnome-icon-theme.pc diff --git a/scalable/apps/Makefile.am b/scalable/apps/Makefile.am index 97bc670e6..39ffebec6 100644 --- a/scalable/apps/Makefile.am +++ b/scalable/apps/Makefile.am @@ -2,7 +2,7 @@ NULL= iconsize=scalable category=apps -icondir = $(datadir)/icons/hicolor/$(iconsize)/$(category) +icondir = $(datadir)/icons/gnome/$(iconsize)/$(category) icon_DATA =\ evolution.svg \ -- cgit v1.2.1