diff options
| author | Jakub Steiner <jimmac@gmail.com> | 2022-12-01 10:15:51 +0100 |
|---|---|---|
| committer | Jakub Steiner <jimmac@gmail.com> | 2022-12-01 10:15:51 +0100 |
| commit | 5a6b10a7fd8a37889c7db32be53c1eaf3246ae2d (patch) | |
| tree | c4f859f8638fe66657a0e2b44d69bdceed38651f | |
| parent | c65ee01a686a3aa318ec4f2aae41dcd68ac4b396 (diff) | |
| download | adwaita-icon-theme-5a6b10a7fd8a37889c7db32be53c1eaf3246ae2d.tar.gz | |
more build fixes
| -rw-r--r-- | src/fullcolor/Makefile.am | 4 | ||||
| -rw-r--r-- | src/spinner/Makefile.am | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am index 4fe02f39c..47223a819 100644 --- a/src/fullcolor/Makefile.am +++ b/src/fullcolor/Makefile.am @@ -6,7 +6,7 @@ $(render_sizes): Makefile install-data-local: for size in $(render_sizes); do \ echo "Going to copy files for $$size"; \ - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.{png,svg}"`; do \ context="`dirname $$file`"; \ $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ @@ -18,7 +18,7 @@ install-data-local: ## 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_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.{png,svg}"`; do \ rm -f $(DESTDIR)$(themedir)/$$size/$$file; \ done; \ done diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am index 322dc0df3..7e94edbfe 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,22 +20,22 @@ 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; \ wait 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 = \ |