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
---
 addressbook/ChangeLog                 |  8 ++++++++
 addressbook/Makefile.am               |  9 +++++----
 addressbook/conduit/Makefile.am       | 10 +++++-----
 addressbook/gui/component/Makefile.am | 11 ++++-------
 4 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'addressbook')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 095571766e..ff685225ac 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-03  Srinivasa Ragavan  <sragavan@novell.com>
+
+        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
+
+	* Makefile.am:
+	* conduit/Makefile.am:
+	* gui/component/Makefile.am:
+
 2007-06-02  Gilles Dartiguelongue  <dartigug@esiee.fr>
 
 	reviewed by: <delete if not using a buddy>
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 8d70a4f13f..2ad82313ae 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,12 +1,13 @@
+
+SUBDIRS = util printing importers gui tools
+
 if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
+SUBDIRS += conduit
 endif
 
-SUBDIRS =	\
-	util printing importers gui tools $(CONDUIT_SUBDIR)
-
 error_DATA = addressbook.error
 errordir = $(privdatadir)/errors
+
 @EVO_PLUGIN_RULE@
 
 EXTRA_DIST =			\
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index f93b9bce1b..69cbeaf14d 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -12,24 +12,24 @@ INCLUDES = 					\
 # Address Conduit
 privconduit_LTLIBRARIES = libeaddress_conduit.la
 
-libeaddress_conduit_la_SOURCES = \
+libeaddress_conduit_la_SOURCES = 		\
 	address-conduit.c
 
 libeaddress_conduit_la_LDFLAGS = -module -avoid-version
+
 libeaddress_conduit_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
 
-e-address-$(BASE_VERSION).conduit: e-address.conduit.in
+e-address.conduit: e-address.conduit.in
 	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 		\
 	    -e 's^\@datadir\@^$(datadir)^g' 				\
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
 
 conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-address-$(BASE_VERSION).conduit
+conduit_DATA = e-address.conduit
 
 BUILT_SOURCES = $(conduit_DATA)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index b34d51863b..c55b971687 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES =									\
+INCLUDES =							\
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
@@ -60,16 +60,13 @@ libevolution_addressbook_la_LIBADD =							\
 	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
 
 
-
 libevolution_addressbook_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 # GConf schemas
 
 schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_addressbook.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_addressbook.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -92,7 +89,7 @@ install-data-local:
 endif
 
 server_in_files = GNOME_Evolution_Addressbook.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+server_DATA = $(server_in_files:.server.in.in=.server)
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
-- 
cgit v1.2.3