Fix for version removal from installed files.

svn path=/trunk/; revision=33646

7 files changed, 44 insertions, 32 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f78de9d249..333c5b6ab3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2007-06-03  Srinivasa Ragavan <sragavan@novell.com>
+
+        ** Fix for version removal from Installed files from Gilles Dartiguelongue 
+
+	* Makefile.am:
+	* conduits/calendar/Makefile.am:
+	* conduits/memo/Makefile.am:
+	* conduits/todo/Makefile.am:
+	* gui/Makefile.am:
+	* gui/alarm-notify/Makefile.am:
+
 2006-09-08  Ushveen Kaur <kushveen@novell.com>
 
 	** Fixes bug #347767
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index f9a54aff06..f08e48d566 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,13 +1,13 @@
+
+SUBDIRS = idl common importers gui
+
 if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
+SUBDIRS += conduits
 endif
 
-SUBDIRS = idl common importers gui $(CONDUIT_DIR)
-
 error_DATA = calendar.error
 errordir = $(privdatadir)/errors
+
 @EVO_PLUGIN_RULE@
 
 EXTRA_DIST =			\
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 8abfc96bb1..36ec220208 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -8,24 +8,25 @@ INCLUDES = 					\
 # Calendar Conduit
 privconduit_LTLIBRARIES = libecalendar_conduit.la
 
-libecalendar_conduit_la_SOURCES = 	\
+libecalendar_conduit_la_SOURCES = 		\
 	calendar-conduit.c
 
 libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 libecalendar_conduit_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la	 			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la	 		\
+	$(top_builddir)/e-util/libeconduit.la				\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
-e-calendar-$(BASE_VERSION).conduit: e-calendar.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 				\
+e-calendar.conduit: e-calendar.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-calendar-$(BASE_VERSION).conduit
+conduit_DATA = e-calendar.conduit
 
 BUILT_SOURCES = $(conduit_DATA)
 CLEANFILES = $(BUILT_SOURCES)
@@ -34,4 +35,4 @@ EXTRA_DIST = \
 	e-calendar.conduit.in
 
 dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
\ No newline at end of file
+	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/conduits/memo/Makefile.am b/calendar/conduits/memo/Makefile.am
index 70494168ca..afbee4e56c 100644
--- a/calendar/conduits/memo/Makefile.am
+++ b/calendar/conduits/memo/Makefile.am
@@ -8,24 +8,25 @@ INCLUDES = 					\
 # Memo Conduit
 privconduit_LTLIBRARIES = libememo_conduit.la
 
-libememo_conduit_la_SOURCES = 	\
+libememo_conduit_la_SOURCES = 			\
 	memo-conduit.c
 
-libememo_conduit_la_LDFLAGS = -module -avoid-version
+libememo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 libememo_conduit_la_LIBADD = 						\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
+	$(top_builddir)/e-util/libeconduit.la				\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
-e-memo-$(BASE_VERSION).conduit: e-memo.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 			\
+e-memo.conduit: e-memo.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-memo-$(BASE_VERSION).conduit
+conduit_DATA = e-memo.conduit
 
 BUILT_SOURCES = $(conduit_DATA)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 9c3ae10874..2978fcef61 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -8,24 +8,25 @@ INCLUDES = 					\
 # ToDo Conduit
 privconduit_LTLIBRARIES = libetodo_conduit.la
 
-libetodo_conduit_la_SOURCES = 	\
+libetodo_conduit_la_SOURCES = 			\
 	todo-conduit.c
 
 libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 libetodo_conduit_la_LIBADD = 						\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
+	$(top_builddir)/e-util/libeconduit.la				\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
-e-todo-$(BASE_VERSION).conduit: e-todo.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 			\
+e-todo.conduit: e-todo.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-todo-$(BASE_VERSION).conduit
+conduit_DATA = e-todo.conduit
 
 BUILT_SOURCES = $(conduit_DATA)
 CLEANFILES = $(BUILT_SOURCES)
@@ -34,4 +35,4 @@ EXTRA_DIST = \
 	e-todo.conduit.in
 
 dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
\ No newline at end of file
+	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index bd0601b264..efb573ebce 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -244,17 +244,15 @@ libevolution_calendar_la_LIBADD =					\
 libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 server_in_files = GNOME_Evolution_Calendar.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@
 
 # GConf schemas
 
 schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_calendar.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_calendar.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 8b9be3d141..cd1b638fb6 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -54,7 +54,7 @@ evolution_alarm_notify_LDADD =						\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 server_in_files = GNOME_Evolution_Calendar_AlarmNotify.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@