From 2b95910ce14c3d421ca49dd709f3cf08b3b178f5 Mon Sep 17 00:00:00 2001 From: Juraj Fiala Date: Thu, 22 Mar 2018 15:24:21 +0100 Subject: HC: Simplify index.theme generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 9ac59e99 introduced a regression when building inside the tree, but instead of trying to fix sed with more sed, let’s get rid of it. Heavy-lifting done by Simon McVittie (@smcv). Fixes #17. --- themes/HighContrast/icons/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/HighContrast/icons/Makefile.am b/themes/HighContrast/icons/Makefile.am index 5545157e..2af6ebf5 100644 --- a/themes/HighContrast/icons/Makefile.am +++ b/themes/HighContrast/icons/Makefile.am @@ -3,10 +3,10 @@ theme_DATA = index.theme render_sizes = "16x16" "22x22" "24x24" "32x32" "48x48" "256x256" "scalable" -THEME_DIRS=$(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$$size/* -type d`; do printf "$$dir,"; done; done;) +THEME_DIRS=$(shell set -e; cd "$(srcdir)"; SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $$size/* -type d`; do printf "$$dir,"; done; done;) %.theme: %.theme.in Makefile - dirs="`echo $(THEME_DIRS) | sed -e \"s#$(srcdir)/*##g\"`"; \ + dirs="$(THEME_DIRS)"; \ sed -e "s|\@THEME_DIRS\@|$$dirs|g" < $< > $@; \ echo "" >> $@; \ for dir in `echo $$dirs | sed -e "s/,/ /g"`; do \ -- cgit v1.2.1