diff options
| author | JP Rosevear <jpr@ximian.com> | 2003-12-02 03:22:22 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2003-12-02 03:22:22 +0800 |
| commit | 6c207314b897754eb98c433b3a8d580a7dfbeda6 (patch) | |
| tree | 1df30c2c21560ded9a5f9f8347dcc9f598c55751 | |
| parent | 4582a6d2e67ad813c782b9b2c83731049385a041 (diff) | |
| download | gsoc2013-evolution-6c207314b897754eb98c433b3a8d580a7dfbeda6.tar.gz gsoc2013-evolution-6c207314b897754eb98c433b3a8d580a7dfbeda6.tar.zst gsoc2013-evolution-6c207314b897754eb98c433b3a8d580a7dfbeda6.zip | |
install to privlibdir
2003-12-01 JP Rosevear <jpr@ximian.com>
* conduits/todo/Makefile.am: install to privlibdir
* conduits/calendar/Makefile.am: ditto
* conduits/todo/e-todo.conduit.in: subst in correct thing
* conduits/calendar/e-calendar.conduit.in: subst in correct thing
svn path=/trunk/; revision=23534
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/conduits/calendar/Makefile.am | 5 | ||||
| -rw-r--r-- | calendar/conduits/calendar/e-calendar.conduit.in | 2 | ||||
| -rw-r--r-- | calendar/conduits/todo/Makefile.am | 5 | ||||
| -rw-r--r-- | calendar/conduits/todo/e-todo.conduit.in | 2 |
5 files changed, 16 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 1ea0535647..bfbc0745d5 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2003-12-01 JP Rosevear <jpr@ximian.com> + + * conduits/todo/Makefile.am: install to privlibdir + + * conduits/calendar/Makefile.am: ditto + + * conduits/todo/e-todo.conduit.in: subst in correct thing + + * conduits/calendar/e-calendar.conduit.in: subst in correct thing + 2003-12-01 Rodrigo Moya <rodrigo@ximian.com> * gui/alarm-notify/alarm-notify.c (add_uri_to_load, remove_uri_to_load): diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am index b670939538..12b1ae325d 100644 --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -4,8 +4,7 @@ INCLUDES = \ $(EVOLUTION_CALENDAR_CONDUIT_CFLAGS) # Calendar Conduit -e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits -e_calendar_conduits_LTLIBRARIES = libecalendar_conduit.la +privlib_LTLIBRARIES = libecalendar_conduit.la libecalendar_conduit_la_SOURCES = \ calendar-conduit.c @@ -17,7 +16,7 @@ libecalendar_conduit_la_LIBADD = \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) e-calendar-$(BASE_VERSION).conduit: e-calendar.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/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in index 3bf0c3b9ae..9370bf487e 100644 --- a/calendar/conduits/calendar/e-calendar.conduit.in +++ b/calendar/conduits/calendar/e-calendar.conduit.in @@ -1,5 +1,5 @@ <gnome-pilot-conduit version="1.0"> - <conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/> + <conduit id="e_calendar_conduit" type="shlib" location="@privlibdir@/libecalendar_conduit.so"/> <name value="ECalendar"/> <conduit-attribute name="description" value="Synchronizes Calendar with Evolution @BASE_VERSION@"/> <conduit-attribute name="default-synctype" value="synchronize"/> diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am index 0de69d0f66..5a3a721772 100644 --- a/calendar/conduits/todo/Makefile.am +++ b/calendar/conduits/todo/Makefile.am @@ -4,8 +4,7 @@ INCLUDES = \ $(EVOLUTION_CALENDAR_CONDUIT_CFLAGS) # ToDo Conduit -e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits -e_todo_conduits_LTLIBRARIES = libetodo_conduit.la +privlib_LTLIBRARIES = libetodo_conduit.la libetodo_conduit_la_SOURCES = \ todo-conduit.c @@ -17,7 +16,7 @@ libetodo_conduit_la_LIBADD = \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) e-todo-$(BASE_VERSION).conduit: e-todo.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/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in index 1bfe02045c..2ff0288edf 100644 --- a/calendar/conduits/todo/e-todo.conduit.in +++ b/calendar/conduits/todo/e-todo.conduit.in @@ -1,5 +1,5 @@ <gnome-pilot-conduit version="1.0"> - <conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/> + <conduit id="e_todo_conduit" type="shlib" location="@privlibdir@/libetodo_conduit.so"/> <name value="EToDo"/> <conduit-attribute name="description" value="Synchronizes ToDo List with Evolution @BASE_VERSION@"/> <conduit-attribute name="default-synctype" value="synchronize"/> |