aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/conduit/Makefile.am4
-rw-r--r--addressbook/conduit/e-address.conduit.in2
3 files changed, 9 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ed4e33b024..6c66795cca 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,11 @@
2003-12-01 JP Rosevear <jpr@ximian.com>
+ * conduit/Makefile.am: use privconduitdir
+
+ * conduit/e-address.conduit.in: subst right thing
+
+2003-12-01 JP Rosevear <jpr@ximian.com>
+
* conduit/e-address.conduit.in: specify privlibdir as the location
* conduit/Makefile.am: install the conduit to privlibdir
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 0ed77c1158..3c6b0f2314 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
# Address Conduit
-privlib_LTLIBRARIES = libeaddress_conduit.la
+privconduit_LTLIBRARIES = libeaddress_conduit.la
libeaddress_conduit_la_SOURCES = \
address-conduit.c
@@ -21,7 +21,7 @@ libeaddress_conduit_la_LIBADD = \
$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
e-address-$(BASE_VERSION).conduit: e-address.conduit.in
- sed -e 's^\@privlibdir\@^$(privlibdir)^g' \
+ sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' \
-e 's^\@datadir\@^$(datadir)^g' \
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
$< > $@
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
index abe8eef529..669a506001 100644
--- a/addressbook/conduit/e-address.conduit.in
+++ b/addressbook/conduit/e-address.conduit.in
@@ -1,5 +1,5 @@
<gnome-pilot-conduit version="1.0">
- <conduit id="e_address_conduit" type="shlib" location="@privlibdir@/libeaddress_conduit.so"/>
+ <conduit id="e_address_conduit" type="shlib" location="@privconduitdir@/libeaddress_conduit.so"/>
<name value="EAddress"/>
<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
<conduit-attribute name="default-synctype" value="synchronize"/>