diff options
| author | Jakub Steiner <jimmac@gmail.com> | 2010-03-24 22:50:37 +0100 |
|---|---|---|
| committer | Jakub Steiner <jimmac@gmail.com> | 2010-03-24 22:50:37 +0100 |
| commit | 2d5418f1ffc1c489e609d24c8fe724fdace159df (patch) | |
| tree | 13af09188784d5abf9c836f8a84b9da9a08779b8 | |
| parent | e6ee931755d2af259a14ad8bd68b2c9f8c0d7b4d (diff) | |
| download | adwaita-icon-theme-2d5418f1ffc1c489e609d24c8fe724fdace159df.tar.gz | |
Patch by Luca Ferreti to enable legacy icon mapping during installation. bug #609458
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 5da26cbab..d25ab1bc8 100644 --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,10 @@ if test "x$enable_mapping" != "xno"; then AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build and install gnome-icon-theme]) fi +else + ICONMAP="false" fi + AC_SUBST(ICONMAP) # need git, icontool, and inkscape for rendering diff --git a/src/Makefile.am b/src/Makefile.am index b926dd8f3..c961d1e65 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,13 +23,29 @@ render: render-png install-data-local: for size in $(render_sizes); do \ + echo -e "Going to copy files for $$size"; \ for file in `cd $(top_builddir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ context="`dirname $$file`"; \ $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ done; \ - done + done; \ + if [ $(ICONMAP) != "false" ]; then \ + cd $(DESTDIR)$(themedir); \ + for size in $(render_sizes); do \ + cd $$size; \ + echo -e "Going to set up icon mapping for $$size"; \ + for dir in `find . -type d`; do \ + context="`echo $$dir | cut -c 3-`"; \ + if [ $$context ]; then \ + $(ICONMAP) -c $$context; \ + fi; \ + done; \ + cd ..; \ + done; \ + fi +## FIXME we should add a way to remove links generated by icon mapping uninstall-local: for size in $(render_sizes); do \ for file in `cd $(top_builddir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ |