gnome-themes r1474 - in trunk: . icon-themes/Crux/16x16/actions icon-themes/Crux/16x16/places icon-themes/Crux/16x16/status icon-themes/Crux/22x22/actions icon-themes/Crux/22x22/places icon-themes/Crux/22x22/status icon-themes/Crux/24x24/actions icon-themes/Crux/24x24/places icon-themes/Crux/24x24/status icon-themes/Crux/32x32/actions icon-themes/Crux/32x32/places icon-themes/Crux/32x32/status icon-themes/Crux/scalable/actions icon-themes/Crux/scalable/places icon-themes/Crux/scalable/status icon-themes/HighContrast-SVG/48x48/animations icon-themes/HighContrast-SVG/scalable/actions icon-themes/HighContrast-SVG/scalable/apps icon-themes/HighContrast-SVG/scalable/categories icon-themes/HighContrast-SVG/scalable/devices icon-themes/HighContrast-SVG/scalable/emblems icon-themes/HighContrast-SVG/scalable/emotes icon-themes/HighContrast-SVG/scalable/mimetypes icon-themes/HighContrast-SVG/scalable/places icon-themes/HighContrast-SVG/scalable/status icon-themes/HighContrastL argePrint/36x36/animations icon-themes/HighContrastLargePrint/48x48/actions icon-themes/HighContrastLargePrint/48x48/apps icon-themes/HighContrastLargePrint/48x48/categories icon-themes/HighContrastLargePrint/48x48/devices icon-themes/HighContrastLargePrint/48x48/emblems icon-themes/HighContrastLargePrint/48x48/mimetypes icon-themes/HighContrastLargePrint/48x48/places icon-themes/HighContrastLargePrint/48x48/status icon-themes/HighContrastLargePrintInverse/36x36/animations icon-themes/HighContrastLargePrintInverse/48x48/actions icon-themes/HighContrastLargePrintInverse/48x48/apps icon-themes/HighContrastLargePrintInverse/48x48/categories icon-themes/HighContrastLargePrintInverse/48x48/devices icon-themes/HighContrastLargePrintInverse/48x48/emblems icon-themes/HighContrastLargePrintInverse/48x48/mimetypes icon-themes/HighContrastLargePrintInverse/48x48/places icon-themes/HighContrastLargePrintInverse/48x48/status icon-themes/Mist/16x16/actions icon-themes/Mist/16x16/places ic on-themes/Mist/16x16/status icon-themes/Mist/22x22/actions icon-themes/Mist/22x22/places icon-themes/Mist/22x22/status icon-themes/Mist/24x24/actions icon-themes/Mist/24x24/places icon-themes/Mist/24x24/status icon-themes/Mist/32x32/actions icon-themes/Mist/32x32/places icon-themes/Mist/32x32/status icon-themes/Mist/scalable/actions icon-themes/Mist/scalable/places icon-themes/Mist/scalable/status

[calum svn gnome org]

Author: calum
Date: Fri Jun  6 23:46:53 2008
New Revision: 1474
URL: http://svn.gnome.org/viewvc/gnome-themes?rev=1474&view=rev

Log:
Add a --disable-legacy-icon-mapping build option for development
and testing purposes.  (May enable this automatically for dev
builds and disable it for stable releases, as per gnome-icon-theme;
we'll see.)



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/icon-themes/Crux/16x16/actions/Makefile.am
   trunk/icon-themes/Crux/16x16/places/Makefile.am
   trunk/icon-themes/Crux/16x16/status/Makefile.am
   trunk/icon-themes/Crux/22x22/actions/Makefile.am
   trunk/icon-themes/Crux/22x22/places/Makefile.am
   trunk/icon-themes/Crux/22x22/status/Makefile.am
   trunk/icon-themes/Crux/24x24/actions/Makefile.am
   trunk/icon-themes/Crux/24x24/places/Makefile.am
   trunk/icon-themes/Crux/24x24/status/Makefile.am
   trunk/icon-themes/Crux/32x32/actions/Makefile.am
   trunk/icon-themes/Crux/32x32/places/Makefile.am
   trunk/icon-themes/Crux/32x32/status/Makefile.am
   trunk/icon-themes/Crux/scalable/actions/Makefile.am
   trunk/icon-themes/Crux/scalable/places/Makefile.am
   trunk/icon-themes/Crux/scalable/status/Makefile.am
   trunk/icon-themes/HighContrast-SVG/48x48/animations/Makefile.am
   trunk/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am
   trunk/icon-themes/HighContrast-SVG/scalable/apps/Makefile.am
   trunk/icon-themes/HighContrast-SVG/scalable/categories/Makefile.am
   trunk/icon-themes/HighContrast-SVG/scalable/devices/Makefile.am
   trunk/icon-themes/HighContrast-SVG/scalable/emblems/Makefile.am
   trunk/icon-themes/HighContrast-SVG/scalable/emotes/Makefile.am
   trunk/icon-themes/HighContrast-SVG/scalable/mimetypes/Makefile.am
   trunk/icon-themes/HighContrast-SVG/scalable/places/Makefile.am
   trunk/icon-themes/HighContrast-SVG/scalable/status/Makefile.am
   trunk/icon-themes/HighContrastLargePrint/36x36/animations/Makefile.am
   trunk/icon-themes/HighContrastLargePrint/48x48/actions/Makefile.am
   trunk/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am
   trunk/icon-themes/HighContrastLargePrint/48x48/categories/Makefile.am
   trunk/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am
   trunk/icon-themes/HighContrastLargePrint/48x48/emblems/Makefile.am
   trunk/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am
   trunk/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am
   trunk/icon-themes/HighContrastLargePrint/48x48/status/Makefile.am
   trunk/icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile.am
   trunk/icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile.am
   trunk/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am
   trunk/icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile.am
   trunk/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am
   trunk/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am
   trunk/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am
   trunk/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am
   trunk/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am
   trunk/icon-themes/Mist/16x16/actions/Makefile.am
   trunk/icon-themes/Mist/16x16/places/Makefile.am
   trunk/icon-themes/Mist/16x16/status/Makefile.am
   trunk/icon-themes/Mist/22x22/actions/Makefile.am
   trunk/icon-themes/Mist/22x22/places/Makefile.am
   trunk/icon-themes/Mist/22x22/status/Makefile.am
   trunk/icon-themes/Mist/24x24/actions/Makefile.am
   trunk/icon-themes/Mist/24x24/places/Makefile.am
   trunk/icon-themes/Mist/24x24/status/Makefile.am
   trunk/icon-themes/Mist/32x32/actions/Makefile.am
   trunk/icon-themes/Mist/32x32/places/Makefile.am
   trunk/icon-themes/Mist/32x32/status/Makefile.am
   trunk/icon-themes/Mist/scalable/actions/Makefile.am
   trunk/icon-themes/Mist/scalable/places/Makefile.am
   trunk/icon-themes/Mist/scalable/status/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Jun  6 23:46:53 2008
@@ -67,6 +67,12 @@
  [enable_all_themes=no])
 AM_CONDITIONAL(CORE_THEMES_ONLY, test "$enable_all_themes" = no)
 
+AC_ARG_ENABLE(legacy-icon-mapping,
+ AC_HELP_STRING([--disable-legacy-icon-mapping],
+     [Disable symlinking of legacy icon filenames to icon naming spec-compliant filenames (not supported by all themes)]),,
+ [legacy_icon_mapping=yes])
+AM_CONDITIONAL(LEGACY_ICON_MAPPING, test "$legacy_icon_mapping" = yes)
+
 ### Icon sizes for all large print themes
 
 LARGEPRINT_DND="48,48"

Modified: trunk/icon-themes/Crux/16x16/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/16x16/actions/Makefile.am	(original)
+++ trunk/icon-themes/Crux/16x16/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -21,6 +21,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/16x16/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/16x16/places/Makefile.am	(original)
+++ trunk/icon-themes/Crux/16x16/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -13,6 +13,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/16x16/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/16x16/status/Makefile.am	(original)
+++ trunk/icon-themes/Crux/16x16/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/22x22/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/22x22/actions/Makefile.am	(original)
+++ trunk/icon-themes/Crux/22x22/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -21,6 +21,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/22x22/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/22x22/places/Makefile.am	(original)
+++ trunk/icon-themes/Crux/22x22/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -13,6 +13,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/22x22/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/22x22/status/Makefile.am	(original)
+++ trunk/icon-themes/Crux/22x22/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/24x24/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/24x24/actions/Makefile.am	(original)
+++ trunk/icon-themes/Crux/24x24/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -21,6 +21,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/24x24/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/24x24/places/Makefile.am	(original)
+++ trunk/icon-themes/Crux/24x24/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -13,6 +13,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/24x24/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/24x24/status/Makefile.am	(original)
+++ trunk/icon-themes/Crux/24x24/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/32x32/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/32x32/actions/Makefile.am	(original)
+++ trunk/icon-themes/Crux/32x32/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -10,6 +10,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/32x32/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/32x32/places/Makefile.am	(original)
+++ trunk/icon-themes/Crux/32x32/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -13,6 +13,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/32x32/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/32x32/status/Makefile.am	(original)
+++ trunk/icon-themes/Crux/32x32/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/scalable/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/scalable/actions/Makefile.am	(original)
+++ trunk/icon-themes/Crux/scalable/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -21,6 +21,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/scalable/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/scalable/places/Makefile.am	(original)
+++ trunk/icon-themes/Crux/scalable/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -13,6 +13,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Crux/scalable/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Crux/scalable/status/Makefile.am	(original)
+++ trunk/icon-themes/Crux/scalable/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrast-SVG/48x48/animations/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/48x48/animations/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/48x48/animations/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,11 +14,10 @@
 MAINTAINERCLEANFILES =	\
 	Makefile.in
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
-
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 uninstall-symlinks:
 	list=`ls $(DESTDIR)$(themedir)/$(size)/$(context)`; \

Modified: trunk/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -112,10 +112,10 @@
 EXTRA_DIST =				\
 	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 
 uninstall-symlinks:

Modified: trunk/icon-themes/HighContrast-SVG/scalable/apps/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/apps/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/apps/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -35,10 +35,10 @@
 EXTRA_DIST =						\
 	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 
 uninstall-symlinks:

Modified: trunk/icon-themes/HighContrast-SVG/scalable/categories/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/categories/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/categories/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -29,10 +29,10 @@
 EXTRA_DIST =				\
 	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 
 uninstall-symlinks:

Modified: trunk/icon-themes/HighContrast-SVG/scalable/devices/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/devices/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/devices/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -37,10 +37,10 @@
 EXTRA_DIST =				\
 	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 
 uninstall-symlinks:

Modified: trunk/icon-themes/HighContrast-SVG/scalable/emblems/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/emblems/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/emblems/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -19,10 +19,10 @@
 EXTRA_DIST =				\
 	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 
 uninstall-symlinks:

Modified: trunk/icon-themes/HighContrast-SVG/scalable/emotes/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/emotes/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/emotes/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -16,10 +16,10 @@
 EXTRA_DIST =				\
 	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 
 uninstall-symlinks:

Modified: trunk/icon-themes/HighContrast-SVG/scalable/mimetypes/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/mimetypes/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/mimetypes/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -20,10 +20,10 @@
 EXTRA_DIST =					\
 	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 
 uninstall-symlinks:

Modified: trunk/icon-themes/HighContrast-SVG/scalable/places/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/places/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -17,10 +17,10 @@
 EXTRA_DIST =					\
 	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 
 uninstall-symlinks:

Modified: trunk/icon-themes/HighContrast-SVG/scalable/status/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrast-SVG/scalable/status/Makefile.am	(original)
+++ trunk/icon-themes/HighContrast-SVG/scalable/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -32,10 +32,10 @@
 EXTRA_DIST =				\
 	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
-	if  test -n "$(ICONMAP)" ; then \
-		(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context)) ; \
-	fi
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 uninstall-symlinks:
 	list=`ls $(DESTDIR)$(themedir)/$(size)/$(context)`; \

Modified: trunk/icon-themes/HighContrastLargePrint/36x36/animations/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrint/36x36/animations/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrint/36x36/animations/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -13,6 +13,7 @@
 
 EXTRA_DIST=	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrint/48x48/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrint/48x48/actions/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrint/48x48/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,6 +14,7 @@
 
 EXTRA_DIST=	$(icon_DATA) 
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -76,8 +76,10 @@
 EXTRA_DIST=	$(icon_DATA) \
 		symlinks.dat
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 install: install-am
 	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir) 

Modified: trunk/icon-themes/HighContrastLargePrint/48x48/categories/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrint/48x48/categories/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrint/48x48/categories/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -20,6 +20,7 @@
 
 EXTRA_DIST=	$(icon_DATA) 
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -23,8 +23,10 @@
 EXTRA_DIST=	$(icon_DATA) \
 		symlinks.dat
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 install: install-am
 	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)

Modified: trunk/icon-themes/HighContrastLargePrint/48x48/emblems/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrint/48x48/emblems/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrint/48x48/emblems/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -15,6 +15,7 @@
 
 EXTRA_DIST=	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -22,8 +22,10 @@
 EXTRA_DIST=	$(icon_DATA) \
 		symlinks.dat
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 install: install-am
 	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)

Modified: trunk/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -20,6 +20,7 @@
 
 EXTRA_DIST=	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrint/48x48/status/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrint/48x48/status/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrint/48x48/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,6 +14,7 @@
 
 EXTRA_DIST=	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -13,6 +13,7 @@
 
 EXTRA_DIST=	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,6 +14,7 @@
 
 EXTRA_DIST=	$(icon_DATA) 
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -76,9 +76,10 @@
 EXTRA_DIST=	$(icon_DATA) \
 		symlinks.dat
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif
 
 install: install-am
 	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir) 

Modified: trunk/icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -20,6 +20,7 @@
 
 EXTRA_DIST=	$(icon_DATA) 
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -23,8 +23,10 @@
 EXTRA_DIST=	$(icon_DATA) \
 		symlinks.dat
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
+endif
 
 install: install-am
 	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)

Modified: trunk/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -15,6 +15,7 @@
 
 EXTRA_DIST=	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -22,9 +22,10 @@
 EXTRA_DIST=	$(icon_DATA) \
 		symlinks.dat
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif
 
 install: install-am
 	$(SHELL) $(top_srcdir)/common/mkiconlinks.sh $(srcdir)/symlinks.dat $(DESTDIR)$(icondir)

Modified: trunk/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -20,6 +20,7 @@
 
 EXTRA_DIST=	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am
==============================================================================
--- trunk/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am	(original)
+++ trunk/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,6 +14,7 @@
 
 EXTRA_DIST=	$(icon_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/16x16/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/16x16/actions/Makefile.am	(original)
+++ trunk/icon-themes/Mist/16x16/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -10,6 +10,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/16x16/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/16x16/places/Makefile.am	(original)
+++ trunk/icon-themes/Mist/16x16/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,6 +14,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/16x16/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/16x16/status/Makefile.am	(original)
+++ trunk/icon-themes/Mist/16x16/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/22x22/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/22x22/actions/Makefile.am	(original)
+++ trunk/icon-themes/Mist/22x22/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -10,6 +10,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/22x22/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/22x22/places/Makefile.am	(original)
+++ trunk/icon-themes/Mist/22x22/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,6 +14,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/22x22/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/22x22/status/Makefile.am	(original)
+++ trunk/icon-themes/Mist/22x22/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/24x24/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/24x24/actions/Makefile.am	(original)
+++ trunk/icon-themes/Mist/24x24/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -10,6 +10,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/24x24/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/24x24/places/Makefile.am	(original)
+++ trunk/icon-themes/Mist/24x24/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,6 +14,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/24x24/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/24x24/status/Makefile.am	(original)
+++ trunk/icon-themes/Mist/24x24/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/32x32/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/32x32/actions/Makefile.am	(original)
+++ trunk/icon-themes/Mist/32x32/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -10,6 +10,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/32x32/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/32x32/places/Makefile.am	(original)
+++ trunk/icon-themes/Mist/32x32/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,6 +14,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/32x32/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/32x32/status/Makefile.am	(original)
+++ trunk/icon-themes/Mist/32x32/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/scalable/actions/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/scalable/actions/Makefile.am	(original)
+++ trunk/icon-themes/Mist/scalable/actions/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -10,6 +10,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/scalable/places/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/scalable/places/Makefile.am	(original)
+++ trunk/icon-themes/Mist/scalable/places/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -14,6 +14,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif

Modified: trunk/icon-themes/Mist/scalable/status/Makefile.am
==============================================================================
--- trunk/icon-themes/Mist/scalable/status/Makefile.am	(original)
+++ trunk/icon-themes/Mist/scalable/status/Makefile.am	Fri Jun  6 23:46:53 2008
@@ -12,6 +12,7 @@
 EXTRA_DIST =		\
 	$(icons_DATA)
 
+if LEGACY_ICON_MAPPING
 install-data-local: install-iconsDATA
 	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
-
+endif