diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/Makefile.am | 9 | ||||
| -rw-r--r-- | mail/importers/Makefile.am | 15 |
2 files changed, 10 insertions, 14 deletions
diff --git a/mail/Makefile.am b/mail/Makefile.am index a17c594d2a..d0bd2eb38f 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -191,13 +191,11 @@ evolution_mbox_upgrade_LDADD = \ $(EVOLUTION_MAIL_LIBS) server_in_files = GNOME_Evolution_Mail.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@ - # Misc data to install glade_DATA = mail-config.glade local-config.glade subscribe-dialog.glade message-tags.glade mail-search.glade @@ -213,7 +211,6 @@ EXTRA_DIST = \ $(glade_DATA) \ $(schema_DATA) \ $(server_in_files) \ - $(server_DATA) \ $(etspec_DATA) diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 0fde07d8fc..eaa6432231 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -89,16 +89,15 @@ server_in_files = GNOME_Evolution_Mail_Mbox_Importer.server.in.in \ GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in \ GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in \ GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in -server_DATA = $(server_in_files:.server.in.in=.server) -%.server.in: %.server.in.in - sed -e "s|\@BINDIR\@|$(bindir)|" \ - -e "s|\@VERSION\@|$(BASE_VERSION)|" \ - $< > $@ - -EXTRA_DIST = $(server_in_files) $(server_DATA) +server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) +@EVO_SUBST_SERVER_RULE@ +@EVO_NAME_SERVER_RULE@ +@INTLTOOL_SERVER_RULE@ BUILT_SOURCES = $(MAIL_GENERATED) $(server_DATA) CLEANFILES = $(BUILT_SOURCES) +EXTRA_DIST = $(server_in_files) -@INTLTOOL_SERVER_RULE@ +dist-hook: + cd $(distdir); rm -f $(BUILT_SOURCES) |