diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | configure.in | 17 | ||||
| -rw-r--r-- | data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am | 2 | ||||
| -rw-r--r-- | data/cde_app_root/dt/appconfig/icons/C/Makefile.am | 2 | ||||
| -rw-r--r-- | data/cde_app_root/dt/appconfig/types/C/Makefile.am | 2 |
7 files changed, 39 insertions, 10 deletions
@@ -1,3 +1,24 @@ +2003-01-22 Ettore Perazzoli <ettore@ximian.com> + + * 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. + 2003-01-14 Ettore Perazzoli <ettore@ximian.com> * configure.in (ALL_LINGUAS): Remove fr for now, since it doesn't diff --git a/Makefile.am b/Makefile.am index a97b1c538e..4b81e15179 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,8 +45,6 @@ SUBDIRS = \ po -# omf-install - # CDE Stuff if HAVE_DTAPPINTEGRATE diff --git a/acconfig.h b/acconfig.h index 7ce1a5993f..70814f4172 100644 --- a/acconfig.h +++ b/acconfig.h @@ -36,6 +36,9 @@ /* Sub-version identification string. */ #undef SUB_VERSION +/* Base version number (eg. "1.4" for "1.4.7"). */ +#undef BASE_VERSION + /* Preview-release string */ #undef VERSION_COMMENT 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. ################################################## diff --git a/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am b/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am index 0de67a7f0c..d7d1df2b73 100644 --- a/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am +++ b/data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = Evolution if HAVE_DTAPPINTEGRATE -cdeappmanagerdir = $(prefix)/share/evolution/cde_app_root/dt/appconfig/appmanager/C/Ximian +cdeappmanagerdir = $(prefix)/share/evolution-$(BASE_VERSION)/cde_app_root/dt/appconfig/appmanager/C/Ximian cdeappmanager_SCRIPTS = Evolution endif diff --git a/data/cde_app_root/dt/appconfig/icons/C/Makefile.am b/data/cde_app_root/dt/appconfig/icons/C/Makefile.am index bf568ed246..a5d76b37fb 100644 --- a/data/cde_app_root/dt/appconfig/icons/C/Makefile.am +++ b/data/cde_app_root/dt/appconfig/icons/C/Makefile.am @@ -9,7 +9,7 @@ ICONS = \ EXTRA_DIST = $(ICONS) if HAVE_DTAPPINTEGRATE -cdeiconsdir = $(prefix)/share/evolution/cde_app_root/dt/appconfig/icons/C +cdeiconsdir = $(prefix)/share/evolution-$(BASE_VERSION)/cde_app_root/dt/appconfig/icons/C cdeicons_DATA = $(ICONS) endif diff --git a/data/cde_app_root/dt/appconfig/types/C/Makefile.am b/data/cde_app_root/dt/appconfig/types/C/Makefile.am index 72970e50a2..68ee200673 100644 --- a/data/cde_app_root/dt/appconfig/types/C/Makefile.am +++ b/data/cde_app_root/dt/appconfig/types/C/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = Ximian.dt.in if HAVE_DTAPPINTEGRATE -cdetypesdir = $(prefix)/share/evolution/cde_app_root/dt/appconfig/types/C +cdetypesdir = $(prefix)/share/evolution-$(BASE_VERSION)/cde_app_root/dt/appconfig/types/C cdetypes_DATA = Ximian.dt endif
\ No newline at end of file |