aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/gui/component/Makefile.am11
-rw-r--r--addressbook/gui/component/select-names/Makefile.am9
2 files changed, 9 insertions, 11 deletions
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 0e16c5ac92..458e8edbd7 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -78,10 +78,9 @@ install-data-local:
fi
server_in_files = GNOME_Evolution_Addressbook.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@
glade_DATA = ldap-config.glade
@@ -92,9 +91,11 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
$(glade_DATA) \
$(schema_DATA) \
- $(server_DATA) \
$(server_in_files)
+dist-hook:
+ cd $(distdir); rm -f $(BUILT_SOURCES)
+
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index b78e5b69fe..f6d1fc6e5e 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -17,11 +17,9 @@ $(IDL_GENERATED_H): $(idl_DATA)
$(IDL_GENERATED_C): $(IDL_GENERATED_H)
server_in_files = GNOME_Evolution_Addressbook_SelectNames.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@
INCLUDES = \
@@ -90,7 +88,6 @@ etspec_DATA = e-select-names.etspec e-select-names-section.etspec
EXTRA_DIST = \
$(glade_DATA) \
$(server_in_files) \
- $(server_DATA) \
$(idl_DATA) \
$(etspec_DATA) \
e-select-names-marshal.list