diff options
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/Makefile.am | 10 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/Makefile.am | 14 |
2 files changed, 9 insertions, 15 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 876834bfcb..ae623b84db 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -215,18 +215,16 @@ libevolution_calendar_la_LIBADD = \ libevolution_calendar_la_LDFLAGS = -avoid-version -module server_in_files = GNOME_Evolution_Calendar.server.in.in - -server_DATA = $(server_in_files:.server.in.in=.server) -%.server.in: %.server.in.in - sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@ +server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) +@EVO_SUBST_SERVER_RULE@ +@EVO_NAME_SERVER_RULE@ +@INTLTOOL_SERVER_RULE@ # GConf schemas schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_DATA = apps_evolution_calendar.schemas -@INTLTOOL_SERVER_RULE@ - EXTRA_DIST = \ $(glade_DATA) \ $(schema_DATA) \ diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index a5340067a4..82ecd516cf 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -55,17 +55,13 @@ evolution_alarm_notify_LDADD = \ $(top_builddir)/calendar/cal-util/libcal-util.la \ $(EVOLUTION_CALENDAR_LIBS) -server_in_files = \ - GNOME_Evolution_Calendar_AlarmNotify.server.in.in - -server_DATA = $(server_in_files:.server.in.in=.server) -%.server.in: %.server.in.in - sed -e "s|\@LIBEXECDIR\@|$(privlibexecdir)|" $< > $@ - +server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in +server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) +@EVO_SUBST_SERVER_RULE@ +@EVO_NAME_SERVER_RULE@ @INTLTOOL_SERVER_RULE@ -EXTRA_DIST = \ - $(server_DATA) \ +EXTRA_DIST = \ $(server_in_files) \ $(glade_DATA) |