Bug 569082 – use versioned directory for backends

        * configure.ac: Define ev_binary_version and backenddir.
        * evince-document.pc.in: Add backenddir variable.
        * libdocument/Makefile.am:
        * backend/*/Makefile.am: Remove backenddir definition, so it picks
        up the one from configure.

svn path=/trunk/; revision=3382

diff --git a/ChangeLog b/ChangeLog
index 06446f8e0572125b024b045a75095dc65de8f237..6cf8b24417b957e55c338d881bab858abf993942 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-01-25  Christian Persch  <chpe@gnome.org>
+
+        Bug 569082 – use versioned directory for backends
+
+        * configure.ac: Define ev_binary_version and backenddir.
+        * evince-document.pc.in: Add backenddir variable.
+        * libdocument/Makefile.am:
+        * backend/*/Makefile.am: Remove backenddir definition, so it picks
+        up the one from configure.
+
 2009-01-25  Christian Persch  <chpe@gnome.org>
 
         * configure.ac:

diff --git a/backend/comics/Makefile.am b/backend/comics/Makefile.am
index 36a65ae7eea451ac8f9ee95a8cfa29d55d6f4139..34f1ad6b78be6be72bfd7d8baa0b9e77283dd996 100644 (file)
--- a/backend/comics/Makefile.am
+++ b/backend/comics/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =                                     \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \

diff --git a/backend/djvu/Makefile.am b/backend/djvu/Makefile.am
index 1b94646e6a49a1a7b4cbc0188fc9b83ed10469a8..9b460f4a6ad5ff4b4166167dc30261ef67ee9385 100644 (file)
--- a/backend/djvu/Makefile.am
+++ b/backend/djvu/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES = \
        -I$(top_srcdir)                                         \
        -I$(top_srcdir)/libdocument                             \

diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am
index 72afd6a1ce5ff8a856fb4b534eb8f9ce9fc179f5..5a9d4df12c929dbb24d76f878f91f7fbd07b341f 100644 (file)
--- a/backend/dvi/Makefile.am
+++ b/backend/dvi/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = mdvi-lib
 
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =                                     \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \

diff --git a/backend/impress/Makefile.am b/backend/impress/Makefile.am
index b7deeb7b0853de807630c876b5b8ea12baf4f607..d6213f73a1ed25c879902c40e8d70efcbcacf43e 100644 (file)
--- a/backend/impress/Makefile.am
+++ b/backend/impress/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =                                     \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \

diff --git a/backend/pdf/Makefile.am b/backend/pdf/Makefile.am
index 10272c89668257a8b54d2dffa2b4e81f0b6cb6cf..34103e65413d6a4c628af439afee8034c286c149 100644 (file)
--- a/backend/pdf/Makefile.am
+++ b/backend/pdf/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =                                     \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \

diff --git a/backend/pixbuf/Makefile.am b/backend/pixbuf/Makefile.am
index decc8da9c43d9463ff440fc7fcd692e88254f397..016ea8efa3eb52febe865fa73d4eeaa80022381f 100644 (file)
--- a/backend/pixbuf/Makefile.am
+++ b/backend/pixbuf/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =                                     \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \

diff --git a/backend/ps/Makefile.am b/backend/ps/Makefile.am
index 0bc6990da573a0f5cee2a0b59a0ccb420ff5599d..b6c21f65c59806f54bc7d2ab09c2d5d782c97318 100644 (file)
--- a/backend/ps/Makefile.am
+++ b/backend/ps/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =                                     \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \

diff --git a/backend/tiff/Makefile.am b/backend/tiff/Makefile.am
index 79ec11e02c86b1e46cd24e2228baf01927c08b12..0858b6c1dc69fe6930674e03aaca007e51f4e8b1 100644 (file)
--- a/backend/tiff/Makefile.am
+++ b/backend/tiff/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =                                     \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/libdocument             \

diff --git a/configure.ac b/configure.ac
index a19f8fb06bc0013e742e712e5adf13c800d0d6f3..644eb9d31ffe6fa94c6da5a2891eab3ff7210f6f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,9 @@ m4_define([ev_view_lt_age],[0])
 m4_define([ev_view_lt_version_info],[ev_view_lt_current:ev_view_lt_revision:ev_view_lt_age])
 m4_define([ev_view_lt_current_minus_age],[m4_eval(ev_view_lt_current - ev_view_lt_age)])
 
+# Binary version for the document backends
+m4_define([ev_binary_version],[ev_document_lt_current])
+
 # *****************************************************************************
 
 AC_PREREQ([2.57])
@@ -449,6 +452,10 @@ AC_SUBST(EVINCE_MIME_TYPES)
 
 AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your system]))
 
+# Backends directory
+
+AC_SUBST([backenddir],"\$(libdir)/evince/ev_binary_version/backends")
+
 # Versioning
 
 AC_SUBST([EV_MAJOR_VERSION],[ev_major_version])
@@ -456,6 +463,7 @@ AC_SUBST([EV_MINOR_VERSION],[ev_minor_version])
 AC_SUBST([EV_MICRO_VERSION],[ev_micro_version])
 
 AC_SUBST([EV_API_VERSION],[ev_api_version])
+AC_SUBST([EV_BINARY_VERSION],[ev_binary_version])
 
 AC_SUBST([EV_DOCUMENT_LT_VERSION_INFO],[ev_document_lt_version_info])
 AC_SUBST([EV_DOCUMENT_LT_CURRENT_MINUS_AGE],[ev_document_lt_current_minus_age])

diff --git a/evince-document.pc.in b/evince-document.pc.in
index 07536df3b6cca888a6a95d071a20e7a3736921a3..537fb73a0c78bed69a84c5ee9da5eb976edc97c4 100644 (file)
--- a/evince-document.pc.in
+++ b/evince-document.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/evince/@EV_API_VERSION@
+backenddir=@libdir@/evince/@EV_BINARY_VERSION@/backends
 
 Name: Evince Document
 Description: GNOME document viewer backend library

diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 0580c62256fbff9a986f4d8f15e1d470578cea5c..94b049f561d3557352b8912fdce1176c7e0acb27 100644 (file)
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -77,7 +77,7 @@ libevdocument_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"EvDocument\"                   \
        -DEVINCE_UIDIR=\"$(pkgdatadir)\"                \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
-       -DEV_BACKENDSDIR=\"$(libdir)/evince/backends\"  \
+       -DEV_BACKENDSDIR=\"$(backenddir)\"              \
        -DEVINCE_COMPILATION                            \
        $(AM_CPPFLAGS)