aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--data/icons/Makefile.am51
2 files changed, 41 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index afbdfe844..bd0d2ebf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
* data/icons/Makefile.am:
+ Fix icons install paths.
+
+2007-08-09 Christian Persch <chpe@gnome.org>
+
+ * data/icons/Makefile.am:
+
Fix icon cache update command.
2007-08-09 Christian Persch <chpe@gnome.org>
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index c17f3f3b6..76712ad25 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,12 +1,22 @@
NULL =
-themes = \
+public_icons_themes = \
hicolor \
HighContrastLargePrint \
HighContrastLargePrintInverse \
$(NULL)
-icons = \
+public_icons = \
+ hicolor_apps_16x16_gnome-web-browser.png \
+ hicolor_apps_22x22_gnome-web-browser.png \
+ hicolor_apps_24x24_gnome-web-browser.png \
+ hicolor_apps_32x32_gnome-web-browser.png \
+ hicolor_apps_scalable_gnome-web-browser.svg \
+ HighContrastLargePrint_apps_48x48_gnome-web-browser.png \
+ HighContrastLargePrintInverse_apps_48x48_gnome-web-browser.png \
+ $(NULL)
+
+private_icons = \
hicolor_actions_16x16_bookmark-view.png \
hicolor_actions_16x16_history-view.png \
hicolor_actions_16x16_location-entry.png \
@@ -23,11 +33,6 @@ icons = \
hicolor_actions_scalable_bookmark-view.svg \
hicolor_actions_scalable_history-view.svg \
hicolor_actions_scalable_location-entry.svg \
- hicolor_apps_16x16_gnome-web-browser.png \
- hicolor_apps_22x22_gnome-web-browser.png \
- hicolor_apps_24x24_gnome-web-browser.png \
- hicolor_apps_32x32_gnome-web-browser.png \
- hicolor_apps_scalable_gnome-web-browser.svg \
hicolor_places_16x16_bookmark-web.png \
hicolor_places_22x22_bookmark-web.png \
hicolor_places_24x24_bookmark-web.png \
@@ -48,11 +53,9 @@ icons = \
hicolor_status_48x48_lock-secure-checked.png \
hicolor_status_48x48_lock-secure.png \
hicolor_status_scalable_popup-hidden.svg \
- HighContrastLargePrint_apps_48x48_gnome-web-browser.png \
- HighContrastLargePrintInverse_apps_48x48_gnome-web-browser.png \
$(NULL)
-source_icons = \
+noinst_DATA = \
hicolor_actions_16x16_history-view.svg \
hicolor_actions_22x22_history-view.svg \
hicolor_actions_32x32_bookmark-view.svg \
@@ -70,8 +73,9 @@ source_icons = \
$(NULL)
EXTRA_DIST = \
- $(icons) \
- $(source_icons) \
+ $(public_icons) \
+ $(private_icons) \
+ $(noinst_DATA) \
$(NULL)
###############################################################################
@@ -81,33 +85,48 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t
update-icon-cache:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
- for theme in $(themes); do \
+ for theme in $(public_icons_themes); do \
$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
done; \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
- for theme in $(themes); do \
+ for theme in $(public_icons_themes); do \
echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
done; \
fi
install-icons:
- for icon in $(icons); do \
+ for icon in $(public_icons); do \
THEME=`echo $$icon | cut -d_ -f1`; \
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done; \
+ for icon in $(private_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
uninstall-icons:
- -for icon in $(icons); do \
+ -for icon in $(public_icons); do \
THEME=`echo $$icon | cut -d_ -f1`; \
CONTEXT=`echo $$icon | cut -d_ -f2`; \
SIZE=`echo $$icon | cut -d_ -f3`; \
ICONFILE=`echo $$icon | cut -d_ -f4`; \
rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done; \
+ for icon in $(private_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
done
install-data-local: install-icons update-icon-cache