[gnome-icon-theme/gnome-2-30] Allow build where srcdir != builddir
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-icon-theme/gnome-2-30] Allow build where srcdir != builddir
- Date: Thu, 29 Apr 2010 15:12:16 +0000 (UTC)
commit ac5904fc26f075ad1c6743580adac63c3ea17ce5
Author: Paul Smith <psmith gnu org>
Date: Tue Apr 27 12:45:50 2010 -0400
Allow build where srcdir != builddir
src/Makefile.am | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c961d1e..4f99d08 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]