From 05114bc4955e1f49386a210b863af4ac230dab6e Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli 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 --- data/cde_app_root/dt/appconfig/appmanager/C/Ximian/Makefile.am | 2 +- data/cde_app_root/dt/appconfig/icons/C/Makefile.am | 2 +- data/cde_app_root/dt/appconfig/types/C/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') 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 -- cgit v1.2.3