--- a/src/gui/Makefile Fri May 21 16:11:58 2010 +0100
+++ b/src/gui/Makefile Fri May 21 18:22:35 2010 -0700
@@ -237,9 +237,9 @@
#
# Define the paths to all of the stuff we'll install.
#
-ROOTAPPICONS = $(APPICONS:data/%=$(ROOTAPPICONSHARE)/%)
-ROOTAPPHIGHICONS = $(APPHIGHICONS:data/%=$(ROOTAPPHIGHICONSHARE)/%)
-ROOTAPPHIGHINVICONS = $(APPHIGHINVICONS:data/%=$(ROOTAPPHIGHINVICONSHARE)/%)
+ROOTAPPICONS = $(APPICONS:data/icons/48x48/%=$(ROOTAPPICONSHARE)/%)
+ROOTAPPHIGHICONS = $(APPHIGHICONS:data/icons/HighContrast/48x48/%=$(ROOTAPPHIGHICONSHARE)/%)
+ROOTAPPHIGHINVICONS = $(APPHIGHINVICONS:data/icons/HighContrastInverse/48x48/%=$(ROOTAPPHIGHINVICONSHARE)/%)
ROOTCATALOG = $(CATALOG:data/%=$(ROOTDATASHARE)/%)
@@ -373,13 +373,13 @@
$(ROOTDIRS):
$(INSTALL) -d -m 0755 $@
-$(ROOTAPPHIGHICONSHARE)/%: $(ROOTDIRS) data/%
+$(ROOTAPPHIGHICONSHARE)/%: $(ROOTDIRS) data/icons/HighContrast/48x48/%
$(INSTALL) -f $(ROOTAPPHIGHICONSHARE) -m 0644 $<
-$(ROOTAPPHIGHINVICONSHARE)/%: $(ROOTDIRS) data/%
+$(ROOTAPPHIGHINVICONSHARE)/%: $(ROOTDIRS) data/icons/HighContrastInverse/48x48/%
$(INSTALL) -f $(ROOTAPPHIGHINVICONSHARE) -m 0644 $<
-$(ROOTAPPICONSHARE)/%: $(ROOTDIRS) data/%
+$(ROOTAPPICONSHARE)/%: $(ROOTDIRS) data/icons/48x48/%
$(INSTALL) -f $(ROOTAPPICONSHARE) -m 0644 $<
# Ordering of Rules important to have these executed first before more general rules
--- a/src/um/Makefile Fri May 21 16:11:58 2010 +0100
+++ b/src/um/Makefile Fri May 21 18:22:35 2010 -0700
@@ -132,9 +132,9 @@
#
# Define the paths to all of the stuff we'll install.
#
-ROOTAPPICONS = $(APPICONS:data/%=$(ROOTAPPICONSHARE)/%)
-ROOTAPPHIGHICONS = $(APPHIGHICONS:data/%=$(ROOTAPPHIGHICONSHARE)/%)
-ROOTAPPHIGHINVICONS = $(APPHIGHINVICONS:data/%=$(ROOTAPPHIGHINVICONSHARE)/%)
+ROOTAPPICONS = $(APPICONS:data/icons/48x48/%=$(ROOTAPPICONSHARE)/%)
+ROOTAPPHIGHICONS = $(APPHIGHICONS:data/icons/HighContrast/48x48/%=$(ROOTAPPHIGHICONSHARE)/%)
+ROOTAPPHIGHINVICONS = $(APPHIGHINVICONS:data/icons/HighContrastInverse/48x48/%=$(ROOTAPPHIGHINVICONSHARE)/%)
ROOTAUTOSTART = $(AUTOSTART:data/%=$(ROOTAUTOSTARTSHARE)/%)
@@ -238,13 +238,13 @@
$(ROOTDIRS):
$(INSTALL) -d -m 0755 $@
-$(ROOTAPPHIGHICONSHARE)/%: $(ROOTDIRS) data/%
+$(ROOTAPPHIGHICONSHARE)/%: $(ROOTDIRS) data/icons/HighContrast/48x48/%
$(INSTALL) -f $(ROOTAPPHIGHICONSHARE) -m 0644 $<
-$(ROOTAPPHIGHINVICONSHARE)/%: $(ROOTDIRS) data/%
+$(ROOTAPPHIGHINVICONSHARE)/%: $(ROOTDIRS) data/icons/HighContrastInverse/48x48/%
$(INSTALL) -f $(ROOTAPPHIGHINVICONSHARE) -m 0644 $<
-$(ROOTAPPICONSHARE)/%: $(ROOTDIRS) data/%
+$(ROOTAPPICONSHARE)/%: $(ROOTDIRS) data/icons/48x48/%
$(INSTALL) -f $(ROOTAPPICONSHARE) -m 0644 $<
$(ROOTAUTOSTARTSHARE)/%: $(ROOTDIRS) data/%