aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/conduit/Makefile.am17
2 files changed, 13 insertions, 8 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e8dd2bf4f2..3400670f38 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-01 JP Rosvear <jpr@ximian.com>
+
+ * conduit/Makefile.am: version the .conduit file
+
2003-12-01 Hans Petter Jansson <hpj@ximian.com>
* gui/component/Makefile.am (libevolution_addressbook_la_SOURCES):
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 02df188703..ecd44c179e 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -5,7 +5,6 @@ INCLUDES = \
-I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
- $(PISOCK_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
# Address Conduit
@@ -22,18 +21,20 @@ libeaddress_conduit_la_LIBADD = \
$(top_builddir)/camel/libcamel.la \
$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
-e-address.conduit: e-address.conduit.in Makefile
+e-address-$(BASE_VERSION).conduit: e-address.conduit.in
sed -e 's^\@prefix\@^$(prefix)^g' \
-e 's^\@datadir\@^$(datadir)^g' \
- < $(srcdir)/e-address.conduit.in > e-address.conduit.tmp \
- && mv e-address.conduit.tmp e-address.conduit
+ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
+ $< > $@
+conduitdir = $(datadir)/gnome-pilot/conduits/
+conduit_DATA = e-address-$(BASE_VERSION).conduit
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-address.conduit
+BUILT_SOURCES = $(conduit_DATA)
+CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
e-address.conduit.in
-install-data-local:
- $(mkinstalldirs) $(Conduitdir)
+dist-hook:
+ cd $(distdir); rm -f $(BUILT_SOURCES)