diff options
| author | Juraj Fiala <jurf@riseup.net> | 2018-03-22 15:24:21 +0100 |
|---|---|---|
| committer | Juraj Fiala <jurf@riseup.net> | 2018-03-22 15:24:21 +0100 |
| commit | 2b95910ce14c3d421ca49dd709f3cf08b3b178f5 (patch) | |
| tree | 22f6a413fce085ae7cd3d77bb21f37fec2c918f0 | |
| parent | 80f2c9a9dc04c0577918d2a4ec740c951566265a (diff) | |
| download | gnome-themes-standard-2b95910ce14c3d421ca49dd709f3cf08b3b178f5.tar.gz | |
HC: Simplify index.theme generation
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.
| -rw-r--r-- | themes/HighContrast/icons/Makefile.am | 4 |
1 files 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 \ |