From 54a9260f696f5c7462f40af8f838d723ba3abeb5 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Sun, 3 Jun 2007 14:50:35 +0000 Subject: Fix for version removal from installed files. svn path=/trunk/; revision=33646 --- calendar/gui/Makefile.am | 8 +++----- calendar/gui/alarm-notify/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'calendar/gui') 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@ -- cgit v1.2.3