[gnome-icon-theme] Fix install. Patch by William Jon McCann <jmccann redhat com>
- From: Jakub Steiner <jimmac src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-icon-theme] Fix install. Patch by William Jon McCann <jmccann redhat com>
- Date: Tue, 2 Feb 2010 15:19:09 +0000 (UTC)
commit f78b5f086cd4ad241604769ff9e1e31712c71223
Author: Jakub Steiner <jimmac gmail com>
Date: Tue Feb 2 16:17:10 2010 +0100
Fix install. Patch by William Jon McCann <jmccann redhat com>
src/Makefile.am | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 666f686..b926dd8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,5 @@
icon_in_files = $(shell SRCDIR="$(srcdir)"; for i in `find $$SRCDIR -name "*.svg"`; do printf "$$i "; done)
-icon_files = $(shell for i in `find $(top_builddir)/$(SVGOUTDIR) -name "*.png"`; do printf "$$i"; done)
if ALLOW_RENDERING
render-png: $(icon_in_files) Makefile
@@ -24,21 +23,17 @@ render: render-png
install-data-local:
for size in $(render_sizes); do \
- for dir in `if [ -d $(top_srcdir)/$(SVGOUTDIR)/$$size ]; then find $(top_srcdir)/$(SVGOUTDIR)/$$size/* -type d; fi`; do \
- for file in $(icon_files); 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_builddir)/$(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; \
done
uninstall-local:
for size in $(render_sizes); do \
- for dir in `if [ -d $(top_srcdir)/$(SVGOUTDIR)/$$size ]; then find $(top_srcdir)/$(SVGOUTDIR)/$$size/* -type d; fi`; do \
- for file in $(icon_files); do \
- rm -f $(DESTDIR)$(themedir)/$$size/$$file; \
- done; \
+ for file in `cd $(top_builddir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
+ rm -f $(DESTDIR)$(themedir)/$$size/$$file; \
done; \
done
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]