diff options
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/conduit/Makefile.am | 5 | ||||
| -rw-r--r-- | addressbook/conduit/e-address.conduit.in | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 3400670f38..ed4e33b024 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +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 + 2003-12-01 JP Rosvear <jpr@ximian.com> * conduit/Makefile.am: version the .conduit file diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am index ecd44c179e..0ed77c1158 100644 --- a/addressbook/conduit/Makefile.am +++ b/addressbook/conduit/Makefile.am @@ -8,8 +8,7 @@ INCLUDES = \ $(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS) # Address Conduit -e_address_conduitsdir=$(libdir)/gnome-pilot/conduits -e_address_conduits_LTLIBRARIES = libeaddress_conduit.la +privlib_LTLIBRARIES = libeaddress_conduit.la libeaddress_conduit_la_SOURCES = \ address-conduit.c @@ -22,7 +21,7 @@ libeaddress_conduit_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) e-address-$(BASE_VERSION).conduit: e-address.conduit.in - sed -e 's^\@prefix\@^$(prefix)^g' \ + sed -e 's^\@privlibdir\@^$(privlibdir)^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 e5a5ab765e..abe8eef529 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="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/> + <conduit id="e_address_conduit" type="shlib" location="@privlibdir@/libeaddress_conduit.so"/> <name value="EAddress"/> <conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/> <conduit-attribute name="default-synctype" value="synchronize"/> |