From 54a9260f696f5c7462f40af8f838d723ba3abeb5 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@src.gnome.org>
Date: Sun, 3 Jun 2007 14:50:35 +0000
Subject: Fix for version removal from installed files.

svn path=/trunk/; revision=33646
---
 plugins/default-mailer/ChangeLog   |  6 ++++++
 plugins/default-mailer/Makefile.am | 17 +++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'plugins/default-mailer')

diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog
index 98a314f1e6..4c98aba9d0 100644
--- a/plugins/default-mailer/ChangeLog
+++ b/plugins/default-mailer/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
+
+        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
+
+	* Makefile.am:
+
 2007-05-12  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #337616
diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am
index 8f4876e45e..7ba5d4d591 100644
--- a/plugins/default-mailer/Makefile.am
+++ b/plugins/default-mailer/Makefile.am
@@ -14,22 +14,19 @@ liborg_gnome_default_mailer_la_SOURCES = default-mailer.c
 liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in.in
-schema_DATA     = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
+schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in
+schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
 install-data-local:
-	if test -z "$(DESTDIR)" ; then                                                                                          \
-		for p in $(schema_DATA) ; do                                                                                    \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p;             \
-		done                                                                                                            \
+	if test -z "$(DESTDIR)" ; then											\
+		for p in $(schema_DATA) ; do										\
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p;	\
+		done													\
 	fi
 
-EXTRA_DIST = \
+EXTRA_DIST =					\
 	org-gnome-default-mailer.eplug.xml	\
 	org-gnome-default-mailer.error.xml	\
 	$(schema_in_files)
-- 
cgit v1.2.3