[adwaita-icon-theme] Fix rebase error



commit 9e39bf0a9990290d1b25c61851188f1c2177f5b7
Author: William Jon McCann <william jon mccann gmail com>
Date:   Fri Apr 25 15:42:46 2014 -0400

    Fix rebase error

 configure.ac             |    2 +-
 src/symbolic/Makefile.am |   17 -----------------
 2 files changed, 1 insertions(+), 18 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 324f7b0..794fb6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_SUBST(themedir, "\${datadir}/icons/Adwaita")
 
 # Input and Output dirs for the rendering
 AC_SUBST(SVGOUTDIR, "Adwaita")
-AC_SUBST(SVGSRCDIR, "src")
+AC_SUBST(SVGSRCDIR, "src/symbolic")
 
 # Icon sizes we want to install
 AC_SUBST([render_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 256x256"])
diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
index 1b26bed..74d53b1 100644
--- a/src/symbolic/Makefile.am
+++ b/src/symbolic/Makefile.am
@@ -11,9 +11,6 @@ render-png: $(icon_in_files) Makefile
 
 else
 render-png: $(icon_in_files) Makefile
-       if test "x$(top_srcdir)" != "x$(top_builddir)"; then \
-               cp -a $(top_srcdir)/$(SVGOUTDIR) $(top_builddir)/$(SVGOUTDIR); \
-       fi
 
 endif
 
@@ -40,20 +37,6 @@ install-data-local:
 uninstall-local:
        for size in $(symbolic_render_sizes); do \
                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
-       for file in `cd $(top_builddir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
-               context="`dirname $$file`"; \
-               $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \
-               $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file 
$(DESTDIR)$(themedir)/scalable/$$file; \
-       done
-
-uninstall-local:
-       for size in $(symbolic_render_sizes); do \
-               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]