diff options
| author | Ting-Wei Lan <lantw@src.gnome.org> | 2015-02-19 00:16:15 +0800 |
|---|---|---|
| committer | Ting-Wei Lan <lantw@src.gnome.org> | 2015-02-19 01:27:44 +0800 |
| commit | 359fc25aad14af2b69b60dbbc19d10cb28c85b9c (patch) | |
| tree | 6de8921dfbb5e58438f75060d9a3a73760b2d3c4 | |
| parent | 3d88899072362a01bbc3207da2138e405a6f0dba (diff) | |
| download | gtk+-359fc25aad14af2b69b60dbbc19d10cb28c85b9c.tar.gz | |
build: Don't use shopt in the build command
shopt command only works in bash, so we should not use it in gtk/Makefile.am.
https://bugzilla.gnome.org/show_bug.cgi?id=743647
| -rw-r--r-- | gtk/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 721a76d5a2..67d8533688 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1158,10 +1158,10 @@ gtk.gresource.xml: Makefile.am n=`basename $$f`; \ echo " <file compressed='true'>ui/$$n</file>" >> $@; \ done; \ - shopt -s nullglob; \ for s in 16x16 22x22 24x24 32x32 48x48; do \ for c in actions status; do \ for f in $(srcdir)/icons/$$s/$$c/*.png; do \ + test "$$f" = "$(srcdir)/icons/$$s/$$c/*.png" && continue; \ n=`basename $$f`; \ echo " <file>icons/$$s/$$c/$$n</file>" >> $@; \ done; \ |