diff options
author | Paul Smith <psmith@gnu.org> | 2010-04-27 12:45:50 -0400 |
---|---|---|
committer | Jakub Steiner <jimmac@gmail.com> | 2010-04-29 17:09:03 +0200 |
commit | ac5904fc26f075ad1c6743580adac63c3ea17ce5 (patch) | |
tree | 03811980d78983f1e118f0cdb9a934bd2de78b9f | |
parent | 03ad21fcfd420a1880161b3cfc8eb2482fca6561 (diff) | |
download | adwaita-icon-theme-ac5904fc26f075ad1c6743580adac63c3ea17ce5.tar.gz |
Allow build where srcdir != builddir
-rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c961d1e65..4f99d089c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ render: render-png install-data-local: for size in $(render_sizes); do \ echo -e "Going to copy files for $$size"; \ - for file in `cd $(top_builddir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ + 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; \ @@ -33,7 +33,7 @@ install-data-local: if [ $(ICONMAP) != "false" ]; then \ cd $(DESTDIR)$(themedir); \ for size in $(render_sizes); do \ - cd $$size; \ + cd $$size || continue; \ echo -e "Going to set up icon mapping for $$size"; \ for dir in `find . -type d`; do \ context="`echo $$dir | cut -c 3-`"; \ @@ -48,7 +48,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_builddir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ + for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ rm -f $(DESTDIR)$(themedir)/$$size/$$file; \ done; \ done |