aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-01-23 04:09:36 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-01-23 04:09:36 +0800
commitc6c8587eeac8798837c49541ebb268efc2d338a1 (patch)
tree0ed6a06ee2f7ef05d3e1a7bf160074d130b812dd
parent1ac51fc577a71927370b10019469fbc3463e49f8 (diff)
downloadgsoc2013-evolution-c6c8587eeac8798837c49541ebb268efc2d338a1.tar
gsoc2013-evolution-c6c8587eeac8798837c49541ebb268efc2d338a1.tar.gz
gsoc2013-evolution-c6c8587eeac8798837c49541ebb268efc2d338a1.tar.bz2
gsoc2013-evolution-c6c8587eeac8798837c49541ebb268efc2d338a1.tar.lz
gsoc2013-evolution-c6c8587eeac8798837c49541ebb268efc2d338a1.tar.xz
gsoc2013-evolution-c6c8587eeac8798837c49541ebb268efc2d338a1.tar.zst
gsoc2013-evolution-c6c8587eeac8798837c49541ebb268efc2d338a1.zip
Version using $(BASE_VERSION). Likewise. Likewise. Likewise. Likewise.
* Makefile.am: Version using $(BASE_VERSION). * 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. * Makefile.am (instal-data-hook): Use $(DESTDIR); patch from Max Horn <max@quendi.de>. svn path=/trunk/; revision=19556
-rw-r--r--default_user/ChangeLog15
-rw-r--r--default_user/Makefile.am8
-rw-r--r--default_user/local/Calendar/Makefile.am2
-rw-r--r--default_user/local/Contacts/Makefile.am2
-rw-r--r--default_user/local/Drafts/Makefile.am2
-rw-r--r--default_user/local/Inbox/Makefile.am2
-rw-r--r--default_user/local/Outbox/Makefile.am2
-rw-r--r--default_user/local/Sent/Makefile.am2
-rw-r--r--default_user/local/Tasks/Makefile.am2
-rw-r--r--default_user/local/Trash/Makefile.am2
10 files changed, 27 insertions, 12 deletions
diff --git a/default_user/ChangeLog b/default_user/ChangeLog
index ed26816eeb..7bd7d81811 100644
--- a/default_user/ChangeLog
+++ b/default_user/ChangeLog
@@ -1,3 +1,18 @@
+2003-01-22 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: Version using $(BASE_VERSION).
+ * 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.
+
+ * Makefile.am (instal-data-hook): Use $(DESTDIR); patch from Max
+ Horn <max@quendi.de>.
+
2002-09-30 Chris Toshok <toshok@ximian.com>
[ Partial fix for #30657 ]
diff --git a/default_user/Makefile.am b/default_user/Makefile.am
index 6a30840858..83b8a49e32 100644
--- a/default_user/Makefile.am
+++ b/default_user/Makefile.am
@@ -1,13 +1,13 @@
SUBDIRS = local
-defaultdir = $(datadir)/evolution/default_user
+defaultdir = $(datadir)/evolution-$(BASE_VERSION)/default_user
default_DATA = addressbook-sources.xml searches.xml vfolders.xml
EXTRA_DIST = $(default_DATA)
install-data-hook:
- -mkdir $(defaultdir)/private
+ -mkdir $(DESTDIR)$(defaultdir)/private
if ENABLE_NNTP
- -mkdir $(defaultdir)/news
- -mkdir $(defaultdir)/config
+ -mkdir $(DESTDIR)$(defaultdir)/news
+ -mkdir $(DESTDIR)$(defaultdir)/config
endif
diff --git a/default_user/local/Calendar/Makefile.am b/default_user/local/Calendar/Makefile.am
index 9117ae6373..08d76671b4 100644
--- a/default_user/local/Calendar/Makefile.am
+++ b/default_user/local/Calendar/Makefile.am
@@ -1,3 +1,3 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Calendar
+defaultcalendardir = $(datadir)/evolution-$(BASE_VERSION)/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 3a30a122fe..1492213164 100644
--- a/default_user/local/Contacts/Makefile.am
+++ b/default_user/local/Contacts/Makefile.am
@@ -1,4 +1,4 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Contacts
+defaultcalendardir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Contacts
defaultcalendar_DATA = \
folder-metadata.xml \
create-initial
diff --git a/default_user/local/Drafts/Makefile.am b/default_user/local/Drafts/Makefile.am
index e8471ef7f4..5494223f4d 100644
--- a/default_user/local/Drafts/Makefile.am
+++ b/default_user/local/Drafts/Makefile.am
@@ -1,4 +1,4 @@
-defaultfolderdir = $(datadir)/evolution/default_user/local/Drafts
+defaultfolderdir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Drafts
defaultfolder_DATA = folder-metadata.xml mbox
EXTRA_DIST = $(defaultfolder_DATA)
diff --git a/default_user/local/Inbox/Makefile.am b/default_user/local/Inbox/Makefile.am
index ed3ecd58d4..96b42a1a84 100644
--- a/default_user/local/Inbox/Makefile.am
+++ b/default_user/local/Inbox/Makefile.am
@@ -1,4 +1,4 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Inbox
+defaultcalendardir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Inbox
defaultcalendar_DATA = \
folder-metadata.xml \
diff --git a/default_user/local/Outbox/Makefile.am b/default_user/local/Outbox/Makefile.am
index 0f081fc680..7537529080 100644
--- a/default_user/local/Outbox/Makefile.am
+++ b/default_user/local/Outbox/Makefile.am
@@ -1,4 +1,4 @@
-defaultfolderdir = $(datadir)/evolution/default_user/local/Outbox
+defaultfolderdir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Outbox
defaultfolder_DATA = folder-metadata.xml mbox
EXTRA_DIST = $(defaultfolder_DATA)
diff --git a/default_user/local/Sent/Makefile.am b/default_user/local/Sent/Makefile.am
index d76801917e..c9bf03e7a9 100644
--- a/default_user/local/Sent/Makefile.am
+++ b/default_user/local/Sent/Makefile.am
@@ -1,4 +1,4 @@
-defaultfolderdir = $(datadir)/evolution/default_user/local/Sent
+defaultfolderdir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Sent
defaultfolder_DATA = folder-metadata.xml mbox
EXTRA_DIST = $(defaultfolder_DATA)
diff --git a/default_user/local/Tasks/Makefile.am b/default_user/local/Tasks/Makefile.am
index 10ac77fb38..d66371c236 100644
--- a/default_user/local/Tasks/Makefile.am
+++ b/default_user/local/Tasks/Makefile.am
@@ -1,3 +1,3 @@
-defaulttasksdir = $(datadir)/evolution/default_user/local/Tasks
+defaulttasksdir = $(datadir)/evolution-$(BASE_VERSION)/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 25def5bfe9..3e7400e8d8 100644
--- a/default_user/local/Trash/Makefile.am
+++ b/default_user/local/Trash/Makefile.am
@@ -1,4 +1,4 @@
-defaultcalendardir = $(datadir)/evolution/default_user/local/Trash
+defaultcalendardir = $(datadir)/evolution-$(BASE_VERSION)/default_user/local/Trash
defaultcalendar_DATA = folder-metadata.xml
EXTRA_DIST = $(defaultcalendar_DATA)