diff options
| author | Jakub Steiner <jimmac@gmail.com> | 2022-11-30 20:47:07 +0100 |
|---|---|---|
| committer | Jakub Steiner <jimmac@gmail.com> | 2022-11-30 21:05:19 +0100 |
| commit | c65ee01a686a3aa318ec4f2aae41dcd68ac4b396 (patch) | |
| tree | e04c2fc4b12c1c3edbe6364ca7e9b3f6d4c7deb8 | |
| parent | 6ca928b254a3c14b3471c85dd5fff987d046605e (diff) | |
| download | adwaita-icon-theme-c65ee01a686a3aa318ec4f2aae41dcd68ac4b396.tar.gz | |
unbreak the build, maybe?
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/symbolic/Makefile.am | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 6ddc49ba6..e7b120c9a 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/src/symbolic/Makefile.am b/src/symbolic/Makefile.am index f1a46c3c0..9ab551abd 100644 --- a/src/symbolic/Makefile.am +++ b/src/symbolic/Makefile.am @@ -3,7 +3,7 @@ icon_in_files = $(shell SRCDIR="$(srcdir)"; for i in `find $$SRCDIR -name "*.svg # Create placeholder files for folders that will get symbolic pre-rendered file so they are picked up for themes render-placeholders: - 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`"; \ for size in $(symbolic_encode_sizes); do \ $(mkdir_p) $(top_builddir)/$(SVGOUTDIR)/$$size/$$context; \ @@ -38,22 +38,22 @@ install-data-local: done; \ wait; \ 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; \ wait; \ done; \ wait 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; \ |