[evolution] Bug 341802 - Make Evolution installed directories names without version

[Milan Crha <mcrha src gnome org>]

commit b05e2a5f53c184c0ff47858916269e27eb9d51f3
Author: Milan Crha <mcrha redhat com>
Date:   Mon Sep 8 19:21:24 2014 +0200

    Bug 341802 - Make Evolution installed directories names without version

 configure.ac           |    8 ++++----
 data/icons/Makefile.am |   12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c4243dc..6d1e782 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1209,16 +1209,16 @@ dnl *******************
 dnl If you add something here, consider whether or not you also need to add it to one or more .pc.in
 dnl files (for Connector, etc)
 
-privlibdir='${libdir}'/evolution/$BASE_VERSION
+privlibdir='${libdir}'/evolution
 AC_SUBST(privlibdir)
 
-privlibexecdir='${libexecdir}'/evolution/$BASE_VERSION
+privlibexecdir='${libexecdir}'/evolution
 AC_SUBST(privlibexecdir)
 
-privdatadir='${datadir}'/evolution/$BASE_VERSION
+privdatadir='${datadir}'/evolution
 AC_SUBST(privdatadir)
 
-privincludedir='${includedir}'/evolution-$BASE_VERSION
+privincludedir='${includedir}'/evolution
 AC_SUBST(privincludedir)
 
 moduledir="$privlibdir/modules"
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index ec9b0aa..a2eea87 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -255,16 +255,16 @@ install-icons:
                CONTEXT=`echo $$icon | cut -d_ -f2`; \
                SIZE=`echo $$icon | cut -d_ -f3`; \
                ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+               mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
        done
        for icon in $(stock_private_icons); do \
                THEME=`echo $$icon | cut -d_ -f1`; \
                CONTEXT=`echo $$icon | cut -d_ -f2`; \
                SIZE=`echo $$icon | cut -d_ -f3`; \
                ICONFILE=`echo $$icon | cut -d_ -f5`; \
-               mkdir -p $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/stock_$$ICONFILE; \
+               mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+               $(INSTALL_DATA) $(srcdir)/$$icon 
$(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/stock_$$ICONFILE; \
        done
 
 uninstall-icons:
@@ -280,14 +280,14 @@ uninstall-icons:
                CONTEXT=`echo $$icon | cut -d_ -f2`; \
                SIZE=`echo $$icon | cut -d_ -f3`; \
                ICONFILE=`echo $$icon | cut -d_ -f4`; \
-               rm -f $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+               rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
        done
        for icon in $(stock_private_icons); do \
                THEME=`echo $$icon | cut -d_ -f1`; \
                CONTEXT=`echo $$icon | cut -d_ -f2`; \
                SIZE=`echo $$icon | cut -d_ -f3`; \
                ICONFILE=`echo $$icon | cut -d_ -f5`; \
-               rm -f 
$(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/stock_$$ICONFILE; \
+               rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/stock_$$ICONFILE; \
        done
 
 install-data-local: install-icons