11 files changed, 26 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index bd4ad29809..b3b2725774 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-17  JP Rosevear <jpr@ximian.com>
+
+	* configure.in: use the server.mk file to get rules for building
+	versioned .server files
+
 2003-11-17 JP Rosevear <jpr@ximian.com>
 
 	* Makefile.am: Install versioned package config files
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 6071aa9a8a..e004146d5a 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -80,8 +80,7 @@ install-data-local:
 
 server_in_files = GNOME_Evolution_Addressbook.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SUBST_SERVER_RULE@
-@EVO_NAME_SERVER_RULE@
+@EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 glade_DATA =			\
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 15a1647f0a..d1bdd42564 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -18,8 +18,7 @@ $(IDL_GENERATED_C): $(IDL_GENERATED_H)
 
 server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SUBST_SERVER_RULE@
-@EVO_NAME_SERVER_RULE@
+@EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 INCLUDES =						\
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 5e2bc3c8a6..19c764a16e 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -227,8 +227,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=_$(BASE_VERSION).server)
-@EVO_SUBST_SERVER_RULE@
-@EVO_NAME_SERVER_RULE@
+@EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 # GConf schemas
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 6e1675aaa9..e5653e4433 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -53,8 +53,7 @@ evolution_alarm_notify_LDADD =						\
 
 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@
+@EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST =			\
diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am
index 788e2f8b58..a36c7ef4a6 100644
--- a/calendar/importers/Makefile.am
+++ b/calendar/importers/Makefile.am
@@ -41,8 +41,7 @@ libevolution_calendar_importers_la_LIBADD = \
 
 server_in_files = GNOME_Evolution_Calendar_Importer.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SUBST_SERVER_RULE@
-@EVO_NAME_SERVER_RULE@
+@EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 BUILT_SOURCES = $(server_DATA)
diff --git a/configure.in b/configure.in
index f4e7101ea7..93fee0ae46 100644
--- a/configure.in
+++ b/configure.in
@@ -1282,10 +1282,8 @@ INTERFACE_VERSION="$BASE_VERSION"
 AC_SUBST(INTERFACE_VERSION)
 AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "INTERFACE_VERSION", [IDL interface version (Major.Minor)])
 
-EVO_SUBST_SERVER_RULE='%.server.in: %.server.in.in ; sed -e "s|\@BINDIR\@|$(bindir)|" -e "s|\@LIBEXECDIR\@|$(privlibexecdir)|" -e "s|\@COMPONENTDIR\@|$(componentdir)|" -e "s|\@IMPORTERSDIR\@|$(importersdir)|" -e "s|\@VERSION\@|$(BASE_VERSION)|" -e "s|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
-EVO_NAME_SERVER_RULE='%_$(BASE_VERSION).server: %.server ; mv $< $@'
-AC_SUBST(EVO_SUBST_SERVER_RULE)
-AC_SUBST(EVO_NAME_SERVER_RULE)
+EVO_SERVER_RULE=$srcdir/server.mk
+AC_SUBST_FILE(EVO_SERVER_RULE)
 
 ##################################################
 # Check for gtk-doc.
diff --git a/mail/Makefile.am b/mail/Makefile.am
index b3a5e6e828..cac9a4b55d 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -196,8 +196,7 @@ evolution_mbox_upgrade_LDADD = 				\
 
 server_in_files = GNOME_Evolution_Mail.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SUBST_SERVER_RULE@
-@EVO_NAME_SERVER_RULE@
+@EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 # Misc data to install
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am
index eaa6432231..2e2f8881f2 100644
--- a/mail/importers/Makefile.am
+++ b/mail/importers/Makefile.am
@@ -90,8 +90,7 @@ server_in_files = GNOME_Evolution_Mail_Mbox_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=_$(BASE_VERSION).server)
-@EVO_SUBST_SERVER_RULE@
-@EVO_NAME_SERVER_RULE@
+@EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 BUILT_SOURCES = $(MAIL_GENERATED) $(server_DATA)
diff --git a/server.mk b/server.mk
new file mode 100644
index 0000000000..acdc12bb65
--- /dev/null
+++ b/server.mk
@@ -0,0 +1,11 @@
+%.server.in: %.server.in.in
+	sed -e 's|\@BINDIR\@|$(bindir)|' 			\
+	-e 's|\@LIBEXECDIR\@|$(privlibexecdir)|' 		\
+	-e 's|\@COMPONENTDIR\@|$(componentdir)|' 		\
+	-e 's|\@IMPORTERSDIR\@|$(importersdir)|' 		\
+	-e 's|\@VERSION\@|$(BASE_VERSION)|' 			\
+	-e 's|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|' $< > $@
+
+%_$(BASE_VERSION).server: %.server
+	mv $< $@
+
diff --git a/shell/Makefile.am b/shell/Makefile.am
index f34e837465..a83991a00b 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -250,8 +250,7 @@ install-test-component: evolution-test-component
 
 server_in_files = GNOME_Evolution_Shell.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
-@EVO_SUBST_SERVER_RULE@
-@EVO_NAME_SERVER_RULE@
+@EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 etspec_DATA = e-storage-set-view.etspec