aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog24
-rw-r--r--addressbook/backend/ebook/Makefile.am2
-rw-r--r--addressbook/backend/pas/Makefile.am5
-rw-r--r--addressbook/gui/component/Makefile.am63
-rw-r--r--addressbook/gui/component/addressbook.c2
-rw-r--r--addressbook/gui/component/select-names/Makefile.am6
-rw-r--r--addressbook/gui/contact-editor/Makefile.am45
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c5
-rw-r--r--addressbook/gui/contact-list-editor/Makefile.am44
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-editor.c2
-rw-r--r--addressbook/gui/merging/Makefile.am6
-rw-r--r--addressbook/gui/search/Makefile.am2
-rw-r--r--addressbook/gui/widgets/Makefile.am41
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c2
-rw-r--r--addressbook/printing/Makefile.am4
15 files changed, 138 insertions, 115 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 126fd4bb1b..4b748d34c7 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,27 @@
+2003-01-22 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/component/select-names/Makefile.am (gladedir): Version using
+ $(BASE_VERSION).
+ (etspecdir): Likewise.
+ (iconsdir): Likewise.
+
+ * gui/contact-list-editor/Makefile.am (iconsdir): Version using
+ $(BASE_VERSION).
+ (gladedir): Likewise.
+
+ * gui/merging/Makefile.am (gladedir): Version using $(BASE_VERSION).
+
+ * gui/search/Makefile.am (ruledir): Version using $(BASE_VERSION).
+
+ * gui/component/Makefile.am (INCLUDES): Update EVOLUTION_IMAGESDIR
+ to be versioned through $(BASE_VERSION).
+
+ * gui/widgets/e-addressbook-view.c (init_collection): Use
+ EVOLUTION_GALVIEWSDIR.
+
+ * gui/widgets/Makefile.am (INCLUDES): Define EVOLUTION_GALVIEWSDIR
+ and update EVOLUTION_IMAGESDIR.
+
2003-01-21 Radek Doulik <rodo@ximian.com>
* printing/e-contact-print.c (e_contact_print_button): don't use
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index b0a452dee7..450c1d052f 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -58,7 +58,7 @@ libebook_la_SOURCES = \
e-destination.c
-libebookincludedir = $(includedir)/evolution/ebook
+libebookincludedir = $(includedir)/evolution-$(BASE_VERSION)/ebook
libebookinclude_HEADERS = \
e-book-listener.h \
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 2b311e8234..d14b447c94 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -36,14 +36,13 @@ if ENABLE_LDAP
LDAP_BACKEND = libpasldap.a
endif
-ldapschemadir = $(datadir)/evolution
-
+ldapschemadir = $(datadir)/evolution-$(BASE_VERSION)
ldapschema_DATA= $(LDAP_SCHEMA)
privlib_LIBRARIES = libpas.a
noinst_LIBRARIES = libpasfile.a $(LDAP_BACKEND)
-pasincludedir = $(includedir)/evolution/pas
+pasincludedir = $(includedir)/evolution-$(BASE_VERSION)/pas
pasinclude_HEADERS = \
$(CORBA_SOURCE_H) \
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 16eb925fe3..b1f585db7a 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,34 +1,35 @@
SUBDIRS = select-names
-INCLUDES = \
- -DG_LOG_DOMAIN=\"evolution-addressbook\" \
- -DPREFIX=\"$(prefix)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(top_srcdir)/shell \
- -I$(top_builddir)/shell \
- -I$(top_srcdir)/widgets/misc \
- -I$(top_srcdir)/addressbook/gui/contact-editor \
- -I$(top_srcdir)/addressbook/gui/contact-list-editor \
- -I$(top_srcdir)/addressbook/gui/minicard \
- -I$(top_srcdir)/addressbook/gui/widgets \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution/images\" \
- $(LDAP_CFLAGS) \
- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DLIBGNOME_DISABLE_DEPRECATED \
- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"evolution-addressbook\" \
+ -DPREFIX=\"$(prefix)\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DDATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)\" \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/shell \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir)/addressbook/gui/contact-editor \
+ -I$(top_srcdir)/addressbook/gui/contact-list-editor \
+ -I$(top_srcdir)/addressbook/gui/minicard \
+ -I$(top_srcdir)/addressbook/gui/widgets \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/images\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ $(LDAP_CFLAGS) \
+ -DG_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
+ -DLIBGNOME_DISABLE_DEPRECATED \
+ -DLIBGNOMEUI_DISABLE_DEPRECATED \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
componentdir = $(COMPONENT_DIR)
@@ -95,10 +96,10 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files)
@INTLTOOL_SERVER_RULE@
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = ldap-config.glade
-iconsdir = $(datadir)/evolution/images
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
EXTRA_DIST = \
$(glade_DATA) \
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 2c2001c4c6..9ab5d87320 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -376,7 +376,7 @@ control_activate (BonoboControl *control,
bonobo_ui_component_freeze (uic, NULL);
bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
- "evolution-addressbook.xml",
+ EVOLUTION_UIDIR "/evolution-addressbook.xml",
"evolution-addressbook", NULL);
e_addressbook_view_setup_menus (view->view, uic);
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 5972f3f4db..87510bf90d 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -50,7 +50,7 @@ INCLUDES = \
-DLIBGNOMEUI_DISABLE_DEPRECATED \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
-lib_LTLIBRARIES = libeselectnames.la
+privlib_LTLIBRARIES = libeselectnames.la
libeselectnames_la_SOURCES = \
$(IDL_GENERATED) \
@@ -94,10 +94,10 @@ e-select-names-marshal.c: e-select-names-marshal.h
MARSHAL_GENERATED = e-select-names-marshal.c e-select-names-marshal.h
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = select-names.glade
-etspecdir = $(datadir)/evolution/etspec
+etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec
etspec_DATA = e-select-names.etspec
EXTRA_DIST = \
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index 62583207a3..38cf7e9da7 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,21 +1,22 @@
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/addressbook/ \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
- -I$(top_srcdir)/addressbook/gui/merging \
- -I$(top_srcdir)/widgets/e-table \
- -I$(top_builddir)/shell \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
- -DEVOLUTIONDIR=\""$(evolutiondir)"\" \
- -DG_LOG_DOMAIN=\"contact-editor\" \
- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DLIBGNOME_DISABLE_DEPRECATED \
- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/ \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+ -I$(top_srcdir)/addressbook/gui/merging \
+ -I$(top_srcdir)/widgets/e-table \
+ -I$(top_builddir)/shell \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
+ -DEVOLUTIONDIR=\""$(evolutiondir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolution_uidir)\"" \
+ -DG_LOG_DOMAIN=\"contact-editor\" \
+ -DG_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
+ -DLIBGNOME_DISABLE_DEPRECATED \
+ -DLIBGNOMEUI_DISABLE_DEPRECATED \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
noinst_LIBRARIES = \
@@ -48,13 +49,11 @@ e-contact-editor-marshal.c: e-contact-editor-marshal.h
MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h
-evolutiondir = $(datadir)/evolution
-
+evolutiondir = $(datadir)/evolution-$(BASE_VERSION)
evolution_DATA = arrow.png
-iconsdir = $(datadir)/evolution/images
-
-gladedir = $(datadir)/evolution/glade
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = \
contact-editor.glade \
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 3cb855fcad..cca369ab1c 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -811,8 +811,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
GtkWidget *uh_oh = gtk_message_dialog_new (NULL,
0, GTK_MESSAGE_ERROR,
GTK_RESPONSE_OK,
- _("Category editor not available."),
- NULL);
+ _("Category editor not available."));
g_free (categories);
gtk_widget_show (uh_oh);
return;
@@ -1179,7 +1178,7 @@ create_ui (EContactEditor *ce)
bonobo_ui_component_add_verb_list_with_data (ce->uic, verbs, ce);
bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
- "evolution-contact-editor.xml",
+ EVOLUTION_UIDIR "/evolution-contact-editor.xml",
"evolution-contact-editor", NULL);
e_pixmaps_update (ce->uic, pixmaps);
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
index 7f13c401c7..1e88a2978b 100644
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ b/addressbook/gui/contact-list-editor/Makefile.am
@@ -1,22 +1,23 @@
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/addressbook/ \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
- -I$(top_srcdir)/addressbook/gui/merging \
+INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/ \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+ -I$(top_srcdir)/addressbook/gui/merging \
-I$(top_srcdir)/addressbook/gui/contact-editor \
- -I$(top_builddir)/shell \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"\
- -DDATADIR=\""$(datadir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
- -DEVOLUTIONDIR=\""$(evolutiondir)"\" \
- -DG_LOG_DOMAIN=\"contact-list-editor\" \
- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DLIBGNOME_DISABLE_DEPRECATED \
- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ -I$(top_builddir)/shell \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DEVOLUTIONDIR=\""$(evolutiondir)"\" \
+ -DG_LOG_DOMAIN=\"contact-list-editor\" \
+ -DG_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
+ -DLIBGNOME_DISABLE_DEPRECATED \
+ -DLIBGNOMEUI_DISABLE_DEPRECATED \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
noinst_LIBRARIES = \
@@ -44,14 +45,13 @@ e-contact-list-editor-marshal.c: e-contact-list-editor-marshal.h
MARSHAL_GENERATED = e-contact-list-editor-marshal.c e-contact-list-editor-marshal.h
-iconsdir = $(datadir)/evolution/images
-
-gladedir = $(datadir)/evolution/glade
+iconsdir = $(datadir)/evolution-$(BASE_VERSION)/images
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = \
contact-list-editor.glade
-etspecdir = $(datadir)/evolution/etspec
+etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec
etspec_DATA = e-contact-list-editor.etspec
BUILT_SOURCES = $(MARSHAL_GENERATED)
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 36ccfe13d1..cb6cbc4213 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -559,7 +559,7 @@ create_ui (EContactListEditor *ce)
ce->uic, verbs, ce);
bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
- "evolution-contact-list-editor.xml",
+ EVOLUTION_UIDIR "/evolution-contact-list-editor.xml",
"evolution-contact-list-editor", NULL);
e_pixmaps_update (ce->uic, pixmaps);
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index 27d3b202e9..2e239e5ae6 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -19,9 +19,9 @@ libecardmerging_a_SOURCES = \
e-card-merging.h
-gladedir = $(datadir)/evolution/glade
-glade_DATA = e-card-duplicate-detected.glade \
- e-card-merging-book-commit-duplicate-detected.glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
+glade_DATA = e-card-duplicate-detected.glade \
+ e-card-merging-book-commit-duplicate-detected.glade
EXTRA_DIST = \
$(glade_DATA)
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index 35ed1a6e49..65d7cb2f79 100644
--- a/addressbook/gui/search/Makefile.am
+++ b/addressbook/gui/search/Makefile.am
@@ -1,4 +1,4 @@
-ruledir = $(datadir)/evolution
+ruledir = $(datadir)/evolution-$(BASE_VERSION)
rule_DATA = addresstypes.xml
EXTRA_DIST = addresstypes.xml
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 01a139b8ba..aa3dbe464c 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,21 +1,22 @@
-INCLUDES = \
- -DG_LOG_DOMAIN=\"e-minicard\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution/images\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
- -I$(top_srcdir)/addressbook/gui/contact-editor \
- -I$(top_srcdir)/addressbook/gui/merging \
- -I$(top_srcdir)/addressbook/gui/component \
- -I$(top_srcdir)/widgets/misc \
- -I$(top_builddir)/shell \
- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DLIBGNOME_DISABLE_DEPRECATED \
- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"e-minicard\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_IMAGESDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/images\" \
+ -DEVOLUTION_GALVIEWSDIR=\""$(datadir)"/evolution-$(BASE_VERSION)/views\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+ -I$(top_srcdir)/addressbook/gui/contact-editor \
+ -I$(top_srcdir)/addressbook/gui/merging \
+ -I$(top_srcdir)/addressbook/gui/component \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+ -DG_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
+ -DLIBGNOME_DISABLE_DEPRECATED \
+ -DLIBGNOMEUI_DISABLE_DEPRECATED \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
noinst_LIBRARIES = \
@@ -153,10 +154,10 @@ MARSHAL_GENERATED = e-addressbook-marshal.c e-addressbook-marshal.h
# $(top_builddir)/addressbook/gui/merging/libecardmerging.a \
# $(EVOLUTION_ADDRESSBOOK_LIBS)
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA =
-etspecdir = $(datadir)/evolution/etspec
+etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec
etspec_DATA= e-addressbook-view.etspec
EXTRA_DIST = \
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index c218e76444..a426153909 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -395,7 +395,7 @@ init_collection (void)
galview = gnome_util_prepend_user_home("/evolution/views/addressbook/");
gal_view_collection_set_storage_directories
(collection,
- EVOLUTION_DATADIR "/evolution/views/addressbook/",
+ EVOLUTION_GALVIEWSDIR "/addressbook/",
galview);
g_free(galview);
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 423dac4f6a..bafa872241 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -1,11 +1,11 @@
-ecpsdir = $(datadir)/evolution/ecps
+ecpsdir = $(datadir)/evolution-$(BASE_VERSION)/ecps
ecps_DATA = \
smallbook.ecps \
medbook.ecps \
phonelist.ecps
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = \
e-contact-print.glade
generated by cgit (git 2.34.1) at 2024-11-06 05:57:52 +0800