From ca7f26e7bd14b3306d6a90d60522ed3bcfc19cd8 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 19 Sep 2000 19:47:12 +0000 Subject: Change "$(prefix)/share" to "$(datadir)" in a few places. Problem noticed by ade@freebsd.org svn path=/trunk/; revision=5508 --- addressbook/ChangeLog | 5 +++++ addressbook/gui/search/Makefile.am | 2 +- default_user/ChangeLog | 4 ++++ default_user/Makefile.am | 2 +- filter/ChangeLog | 5 +++++ filter/Makefile.am | 4 ++-- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index cf2ad34980..9522962c2c 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2000-09-19 Dan Winship + + * gui/search/Makefile.am (ruledir): Use $(datadir), not + $(prefix)/share + 2000-09-18 Christopher James Lahey * backend/ebook/Makefile.am, contact-editor/Makefile.am, diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am index 0225830708..c4b23523fe 100644 --- a/addressbook/gui/search/Makefile.am +++ b/addressbook/gui/search/Makefile.am @@ -1,4 +1,4 @@ -ruledir = $(prefix)/share/evolution +ruledir = $(datadir)/evolution rule_DATA = addresstypes.xml EXTRA_DIST = addresstypes.xml diff --git a/default_user/ChangeLog b/default_user/ChangeLog index 664a5eba1b..0a7225849e 100644 --- a/default_user/ChangeLog +++ b/default_user/ChangeLog @@ -1,3 +1,7 @@ +2000-09-19 Dan Winship + + * Makefile.am (defaultdir): Use $(datadir), not $(prefix)/share + 2000-09-13 JP Rosevear * local/Sent/Makefile.am (defaultcalendardir): Install the Sent diff --git a/default_user/Makefile.am b/default_user/Makefile.am index 2cff4d1435..a7455498a8 100644 --- a/default_user/Makefile.am +++ b/default_user/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = local -defaultdir = $(prefix)/share/evolution/default_user +defaultdir = $(datadir)/evolution/default_user default_DATA = ldapservers.xml shortcuts.xml EXTRA_DIST = $(default_DATA) diff --git a/filter/ChangeLog b/filter/ChangeLog index f1d4d0bf28..1652ab72e0 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,8 @@ +2000-09-19 Dan Winship + + * Makefile.am (gladedir, filterdir): Use $(datadir), not + $(prefix)/share. + 2000-09-18 Jeffrey Stedfast * filtertypes.xml: Modified to use more intuitive naming diff --git a/filter/Makefile.am b/filter/Makefile.am index d339f625d9..3a5dfe8e24 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -1,5 +1,5 @@ -gladedir = $(prefix)/share/evolution/glade +gladedir = $(datadir)/evolution/glade glade_DATA = filter.glade INCLUDES = \ @@ -71,6 +71,6 @@ EXTRA_DIST = filtertypes.xml vfoldertypes.xml \ filter.glade # basic rules. -filterdir = $(prefix)/share/evolution +filterdir = $(datadir)/evolution filter_DATA = filtertypes.xml vfoldertypes.xml -- cgit v1.2.3