Use privdatadir Likewise. Likewise. Likewise. Likewise. Likewise.

        * Makefile.am: Use privdatadir
        * local/Trash/Makefile.am: Likewise.
        * local/Tasks/Makefile.am: Likewise.
        * local/Sent/Makefile.am: Likewise.
        * local/Outbox/Makefile.am: Likewise.
        * local/Inbox/Makefile.am: Likewise.
        * local/Drafts/Makefile.am: Likewise.
        * local/Contacts/Makefile.am: Likewise.
        * local/Calendar/Makefile.am: Likewise.

svn path=/trunk/; revision=19806

10 files changed, 33 insertions, 21 deletions

diff --git a/default_user/ChangeLog b/default_user/ChangeLog
index 7bd7d81811..fb886199d1 100644
--- a/default_user/ChangeLog
+++ b/default_user/ChangeLog
@@ -1,3 +1,15 @@
+2003-02-06  Dan Winship  <danw@ximian.com>
+
+	* Makefile.am: Use privdatadir
+	* local/Trash/Makefile.am: Likewise.
+	* local/Tasks/Makefile.am: Likewise.
+	* local/Sent/Makefile.am: Likewise.
+	* local/Outbox/Makefile.am: Likewise.
+	* local/Inbox/Makefile.am: Likewise.
+	* local/Drafts/Makefile.am: Likewise.
+	* local/Contacts/Makefile.am: Likewise.
+	* local/Calendar/Makefile.am: Likewise.
+
 2003-01-22  Ettore Perazzoli  <ettore@ximian.com>
 
 	* Makefile.am: Version using $(BASE_VERSION).
diff --git a/default_user/Makefile.am b/default_user/Makefile.am
index 83b8a49e32..c365f340d0 100644
--- a/default_user/Makefile.am
+++ b/default_user/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = local
 
-defaultdir = $(datadir)/evolution-$(BASE_VERSION)/default_user
+defaultdir = $(privdatadir)/default_user
 default_DATA = addressbook-sources.xml searches.xml vfolders.xml
 
 EXTRA_DIST = $(default_DATA)
diff --git a/default_user/local/Calendar/Makefile.am b/default_user/local/Calendar/Makefile.am
index 08d76671b4..25d2d25f0c 100644
--- a/default_user/local/Calendar/Makefile.am
+++ b/default_user/local/Calendar/Makefile.am
@@ -1,3 +1,3 @@
-defaultcalendardir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Calendar
+defaultcalendardir = $(privdatadir)/default_user/local/Calendar
 defaultcalendar_DATA = folder-metadata.xml
 EXTRA_DIST = $(defaultcalendar_DATA)
diff --git a/default_user/local/Contacts/Makefile.am b/default_user/local/Contacts/Makefile.am
index 1492213164..df909d13e8 100644
--- a/default_user/local/Contacts/Makefile.am
+++ b/default_user/local/Contacts/Makefile.am
@@ -1,5 +1,5 @@
-defaultcalendardir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Contacts
-defaultcalendar_DATA =		\
+defaultcontactsdir = $(privdatadir)/default_user/local/Contacts
+defaultcontacts_DATA =		\
 	folder-metadata.xml	\
 	create-initial
-EXTRA_DIST = $(defaultcalendar_DATA)
+EXTRA_DIST = $(defaultcontacts_DATA)
diff --git a/default_user/local/Drafts/Makefile.am b/default_user/local/Drafts/Makefile.am
index 5494223f4d..995c5d4875 100644
--- a/default_user/local/Drafts/Makefile.am
+++ b/default_user/local/Drafts/Makefile.am
@@ -1,4 +1,4 @@
-defaultfolderdir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Drafts
-defaultfolder_DATA = folder-metadata.xml mbox
+defaultdraftsdir = $(privdatadir)/default_user/local/Drafts
+defaultdrafts_DATA = folder-metadata.xml mbox
 
-EXTRA_DIST = $(defaultfolder_DATA)
+EXTRA_DIST = $(defaultdrafts_DATA)
diff --git a/default_user/local/Inbox/Makefile.am b/default_user/local/Inbox/Makefile.am
index 96b42a1a84..3f9b3ab36a 100644
--- a/default_user/local/Inbox/Makefile.am
+++ b/default_user/local/Inbox/Makefile.am
@@ -1,7 +1,7 @@
-defaultcalendardir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Inbox
+defaultinboxdir = $(privdatadir)/default_user/local/Inbox
 
-defaultcalendar_DATA = 		\
+defaultinbox_DATA = 		\
 	folder-metadata.xml	\
 	mbox
 
-EXTRA_DIST = $(defaultcalendar_DATA)
+EXTRA_DIST = $(defaultinbox_DATA)
diff --git a/default_user/local/Outbox/Makefile.am b/default_user/local/Outbox/Makefile.am
index 7537529080..980b788d2b 100644
--- a/default_user/local/Outbox/Makefile.am
+++ b/default_user/local/Outbox/Makefile.am
@@ -1,4 +1,4 @@
-defaultfolderdir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Outbox
-defaultfolder_DATA = folder-metadata.xml mbox
+defaultoutboxdir = $(privdatadir)/default_user/local/Outbox
+defaultoutbox_DATA = folder-metadata.xml mbox
 
-EXTRA_DIST = $(defaultfolder_DATA)
+EXTRA_DIST = $(defaultoutbox_DATA)
diff --git a/default_user/local/Sent/Makefile.am b/default_user/local/Sent/Makefile.am
index c9bf03e7a9..0a775f2af3 100644
--- a/default_user/local/Sent/Makefile.am
+++ b/default_user/local/Sent/Makefile.am
@@ -1,4 +1,4 @@
-defaultfolderdir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Sent
-defaultfolder_DATA = folder-metadata.xml mbox
+defaultsentdir = $(privdatadir)/default_user/local/Sent
+defaultsent_DATA = folder-metadata.xml mbox
 
-EXTRA_DIST = $(defaultfolder_DATA)
+EXTRA_DIST = $(defaultsent_DATA)
diff --git a/default_user/local/Tasks/Makefile.am b/default_user/local/Tasks/Makefile.am
index d66371c236..f64d46925f 100644
--- a/default_user/local/Tasks/Makefile.am
+++ b/default_user/local/Tasks/Makefile.am
@@ -1,3 +1,3 @@
-defaulttasksdir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Tasks
+defaulttasksdir = $(privdatadir)/default_user/local/Tasks
 defaulttasks_DATA = folder-metadata.xml
 EXTRA_DIST = $(defaulttasks_DATA)
diff --git a/default_user/local/Trash/Makefile.am b/default_user/local/Trash/Makefile.am
index 3e7400e8d8..95c254153e 100644
--- a/default_user/local/Trash/Makefile.am
+++ b/default_user/local/Trash/Makefile.am
@@ -1,4 +1,4 @@
-defaultcalendardir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Trash
-defaultcalendar_DATA = folder-metadata.xml
+defaulttrashdir = $(privdatadir)/default_user/local/Trash
+defaulttrash_DATA = folder-metadata.xml
 
-EXTRA_DIST = $(defaultcalendar_DATA)
+EXTRA_DIST = $(defaulttrash_DATA)