[adwaita-icon-theme/wip/jimmac/deprecate-icons] make scalable AND symbolic install

[Jakub Steiner <jimmac src gnome org>]

commit 000442fcafce4e8fdf27d792cbb6d0f1cb4148cb
Author: Jakub Steiner <jimmac gmail com>
Date:   Sat Nov 10 18:10:18 2018 +0100

    make scalable AND symbolic install

 configure.ac             |  4 ++--
 create-icon-theme.sh     |  2 +-
 src/spinner/Makefile.am  | 14 +++++++-------
 src/symbolic/Makefile.am | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 85c3d15a..0d6761e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,9 +25,9 @@ AC_SUBST(SVGOUTDIR, "Adwaita")
 AC_SUBST(SVGSRCDIR, "src/symbolic")
 
 # Icon sizes we want to install
-AC_SUBST([render_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 256x256 512x512"])
+AC_SUBST([render_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 256x256 512x512 scalable"])
 AC_SUBST([symbolic_render_sizes], [""])
-AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256 512x512"])
+AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256 512x512 scalable"])
 
 AC_PROG_LN_S
 AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
diff --git a/create-icon-theme.sh b/create-icon-theme.sh
index 50fcea57..51aba6bf 100755
--- a/create-icon-theme.sh
+++ b/create-icon-theme.sh
@@ -53,7 +53,7 @@ done
 
 echo "Creating Makefiles"
 
-SIZES=$(find * -maxdepth 0 -type d -not -name 'scalable' -printf '%f ')
+SIZES=$(find * -maxdepth 0 -type d -not -name 'symbolic' -printf '%f ')
 
 MAKEFILES='Makefile\n'
 for dir in $SIZES
diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
index 86f4d7cd..631ecb54 100644
--- a/src/spinner/Makefile.am
+++ b/src/spinner/Makefile.am
@@ -4,7 +4,7 @@ icon_in_files = $(shell SRCDIR="$(srcdir)"; for i in `find $$SRCDIR -name "*.svg
 if ALLOW_RENDERING
 render-png: $(icon_in_files) Makefile
        for file in $(icon_in_files); do \
-               size='scalable-up-to-32' \
+               size='symbolic-up-to-32' \
                $(ICONTOOL_RENDER) -s $$size -o $(top_builddir)/$(SVGOUTDIR) $$file >/dev/null; \
        done
 
@@ -20,21 +20,21 @@ render: render-png
 all-local: render
 
 install-data-local:
-             size='scalable-up-to-32'
+             size='symbolic-up-to-32'
              for file in `cd $(top_srcdir)/$(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; \
-       for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
+       for file in `cd $(top_srcdir)/$(SVGOUTDIR)/symbolic-up-to-32; find . -name "*.svg"`; do \
                context="`dirname $$file`"; \
-               $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \
-               $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file 
$(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \
+               $(mkdir_p) $(DESTDIR)$(themedir)/symbolic-up-to-32/$$context; \
+               $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/symbolic-up-to-32/$$file 
$(DESTDIR)$(themedir)/symbolic-up-to-32/$$file; \
        done
 
 uninstall-local:
-             for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
-                     rm -f $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \
+             for file in `cd $(top_srcdir)/$(SVGOUTDIR)/symbolic-up-to-32; find . -name "*.svg"`; do \
+                     rm -f $(DESTDIR)$(themedir)/symbolic-up-to-32/$$file; \
              done
 
 EXTRA_DIST =                   \
diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
index 24aac9be..b1d561f3 100644
--- a/src/symbolic/Makefile.am
+++ b/src/symbolic/Makefile.am
@@ -28,20 +28,20 @@ install-data-local:
                        $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file 
$(DESTDIR)$(themedir)/$$size/$$file; \
                done; \
        done
-       for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
+       for file in `cd $(top_srcdir)/$(SVGOUTDIR)/symbolic; find . -name "*.svg"`; do \
                context="`dirname $$file`"; \
-               $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \
-               $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file 
$(DESTDIR)$(themedir)/scalable/$$file; \
+               $(mkdir_p) $(DESTDIR)$(themedir)/symbolic/$$context; \
+               $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/symbolic/$$file 
$(DESTDIR)$(themedir)/symbolic/$$file; \
                for size in $(symbolic_encode_sizes); do \
                        $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
-                       $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o 
$(DESTDIR)$(themedir)/$$size/$$context; \
+                       $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/symbolic/$$file $$size -o 
$(DESTDIR)$(themedir)/$$size/$$context; \
                done \
        done
 
 uninstall-local:
-       for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
+       for file in `cd $(top_srcdir)/$(SVGOUTDIR)/symbolic; find . -name "*.svg"`; do \
                context="`dirname $$file`"; \
-               rm -f $(DESTDIR)$(themedir)/scalable/$$file; \
+               rm -f $(DESTDIR)$(themedir)/symbolic/$$file; \
                for size in $(symbolic_encode_sizes); do \
                        name="`basename $$file .svg`.symbolic.png"; \
                        rm -f $(DESTDIR)/$(themedir)/$$size/$$context/$$name; \