From 05114bc4955e1f49386a210b863af4ac230dab6e Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Wed, 22 Jan 2003 20:02:32 +0000
Subject: For now, do not install the evolution.1 manpage. Install all the
 other

* data/Makefile.am: For now, do not install the evolution.1
manpage.  Install all the other files with a -$(BASE_VERSION)
suffix.
(dtappintegrate): Update for the new location of cde_app_root.
(dtappunintegrate): Likewise.

* data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am
(cdeappmanagerdir): Version using $(BASE_VERSION).
* data/cde_app_root/dt/appconfig/types/C/Makefile.am
(cdetypesdir): Likewise.
* data/cde_app_root/dt/appconfig/icons/C/Makefile.am
(cdeiconsdir): Likewise.

* sounds/Makefile.am (soundsdir): Version using $(BASE_VERSION).

* configure.in: Define BASE_VERSION.  Set idldir to
$datadir/idl/evolution-$BASE_VERSION instead of just
$datadir/idl/evolution.

svn path=/trunk/; revision=19550
---
 configure.in | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index 42799f1239..f23cd68b1e 100644
--- a/configure.in
+++ b/configure.in
@@ -1005,9 +1005,6 @@ AC_SUBST(IDL_INCLUDES)
 
 AM_PATH_GLIB_2_0
 
-COMPONENT_DIR=$prefix/lib/evolution/components
-AC_SUBST(COMPONENT_DIR)
-
 dnl Utility macro to set compiler flags for a specific lib.
 AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
 	deps="$2"
@@ -1115,15 +1112,25 @@ dnl *******************
 dnl Special directories
 dnl *******************
 
-privlibdir='${libdir}'/evolution/`echo $VERSION | awk -F. '{print $1 "." $2;}'`
+BASE_VERSION=`echo $VERSION | awk -F. '{print $1 "." $2;}'`
+AC_SUBST(BASE_VERSION)
+AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION")
+
+privlibdir='${libdir}'/evolution/'${BASE_VERSION}'
 AC_SUBST(privlibdir)
 
 camel_providerdir="$privlibdir/camel-providers"
 AC_SUBST(camel_providerdir)
 
-idldir="$datadir/idl"
+idldir="$datadir/idl/evolution-$BASE_VERSION"
 AC_SUBST(idldir)
 
+COMPONENT_DIR=$prefix/lib/evolution-$BASE_VERSION/components
+AC_SUBST(COMPONENT_DIR)
+
+evolutionuidir="$datadir/evolution-$BASE_VERSION/ui"
+AC_SUBST(evolutionuidir)
+
 ##################################################
 # Check for gtk-doc.
 ##################################################
-- 
cgit