diff options
| -rw-r--r-- | calendar/ChangeLog | 11 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 4 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/Makefile.am | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 851002e7cc..b95e78d5e0 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,14 @@ +2003-06-05 Not Zed <NotZed@Ximian.com> + + ** For #42691. + + * gui/Makefile.am (%.server.in): implicit rule for .in file. + (BUILT_SOURCES): added server_DATA. + + * gui/alarm-notify/Makefile.am (%.server.in): added implicit rule + for .in file. + (BUILT_SOURCES): added server_DATA. + 2003-06-04 Rodrigo Moya <rodrigo@ximian.com> * pcs/query.c (start_cached_query_cb): adapted to changes in diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 9c58cce4a7..0293eb2a11 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -195,7 +195,7 @@ 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_files:.server.in.in=.server.in): $(server_in_files) +%.server.in: %.server.in.in sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@ # GConf schemas @@ -211,7 +211,7 @@ EXTRA_DIST = \ $(etspec_DATA) \ $(server_in_files) -BUILT_SOURCES = $(IDL_GENERATED) +BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA) CLEANFILES = $(BUILT_SOURCES) install-data-local: diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index 4ad04628a4..20432cb615 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -58,7 +58,7 @@ server_in_files = \ GNOME_Evolution_Calendar_AlarmNotify.server.in.in server_DATA = $(server_in_files:.server.in.in=.server) -$(server_in_files:.server.in.in=.server.in): $(server_in_files) +%.server.in: %.server.in.in sed -e "s|\@LIBEXECDIR\@|$(privlibexecdir)|" $< > $@ @INTLTOOL_SERVER_RULE@ @@ -68,7 +68,7 @@ EXTRA_DIST = \ $(server_in_files) \ $(glade_DATA) -BUILT_SOURCES = $(CORBA_GENERATED) +BUILT_SOURCES = $(CORBA_GENERATED) $(server_DATA) CLEANFILES = $(BUILT_SOURCES) dist-hook: |