GNOME.org
 

[glabels] Make libglabels parallel installable with other versions

commit c69edbd06103ad457c2fa87369094f17d7fa9030
Author: Jim Evins <evins snaught com>
Date:   Tue Feb 23 19:49:42 2010 -0500

    Make libglabels parallel installable with other versions
    
    Made libglabels install as libglabels-3.0 to support parallel installation
    with earlier versions.  Performed some related cleanup associated with
    this move, including installing libglabels.h into include/libglabels-3.0
    and installing all other include files in include/libglabels-3.0/libglabels/.
    
    More work is still need to support parallel installation of the glabels
    application.

 .gitignore                                         |    5 +-
 INSTALL                                            |  236 --------------------
 autogen.sh                                         |    4 +-
 configure.in => configure.ac                       |   86 ++++----
 data/desktop/Makefile.am                           |   10 +
 data/mime/Makefile.am                              |   14 --
 libglabels/Makefile.am                             |   26 ++-
 .../{libglabels.pc.in => libglabels-3.0.pc.in}     |    6 +-
 src/Makefile.am                                    |   13 +-
 src/combo-util.c                                   |    2 +-
 src/file.c                                         |    2 +-
 src/font-history-model.c                           |    2 +-
 src/font-util.c                                    |    2 +-
 src/glabels-batch.c                                |    2 +-
 src/glabels.c                                      |    2 +-
 src/media-select.c                                 |    2 +-
 src/merge-evolution.c                              |    2 +-
 src/merge.c                                        |    2 +-
 src/mini-label-preview.c                           |    2 +-
 src/mini-preview-pixbuf-cache.c                    |    2 +-
 src/mini-preview.c                                 |    2 +-
 src/prefs-model.c                                  |    2 +-
 src/prefs.c                                        |    2 +-
 src/print-op.c                                     |    2 +-
 src/print.c                                        |    2 +-
 src/rotate-label-button.c                          |    2 +-
 src/template-designer.c                            |    2 +-
 src/template-history-model.c                       |    2 +-
 src/xml-label-04.c                                 |    2 +-
 src/xml-label.c                                    |    2 +-
 templates/Makefile.am                              |    4 +-
 31 files changed, 102 insertions(+), 344 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bbfdd15..76b5913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ glabels-*.tar.gz
 #
 /aclocal.m4
 /autom4te.cache
+/autoscan.log
 /config.guess
 /config.h
 /config.h.in
@@ -23,11 +24,13 @@ glabels-*.tar.gz
 /config.status
 /config.sub
 /configure
+/configure.scan
 /depcomp
 /glabels.spec
 /gnome-doc-utils.make
 /gtk-doc.make
 /install-sh
+/INSTALL
 /intltool-extract.in
 /intltool-merge.in
 /intltool-update.in
@@ -39,7 +42,7 @@ glabels-*.tar.gz
 /stamp-h1
 /xmldocs.make
 
-/libglabels/libglabels.pc
+/libglabels/libglabels*.pc
 
 /src/marshal.[ch]
 /src/stock-pixmaps/stockpixbufs.h
diff --git a/autogen.sh b/autogen.sh
index 66bb0fd..307c331 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,11 +4,9 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-REQUIRED_AUTOMAKE_VERSION=1.8
-
 PKG_NAME="glabels"
 
-(test -f $srcdir/configure.in \
+(test -f $srcdir/configure.ac \
   && test -f $srcdir/README \
   && test -d $srcdir/src) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
diff --git a/configure.in b/configure.ac
similarity index 79%
rename from configure.in
rename to configure.ac
index 663d849..c461e8a 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.52)
+AC_PREREQ(2.63)
 
-AC_INIT(glabels, 2.3.pre0svn, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
+AC_INIT([glabels],[2.3.pre0svn],[http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116])
 AC_CONFIG_SRCDIR(src/glabels.c)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
@@ -16,20 +16,27 @@ IT_PROG_INTLTOOL([0.21])
 
 PKG_PROG_PKG_CONFIG
 
-AC_PROG_LIBTOOL
+LT_INIT
 
 GNOME_DOC_INIT
 GTK_DOC_CHECK(1.0)
 
-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
 AC_PROG_INSTALL
 
 GNOME_COMPILE_WARNINGS
 
-AC_PATH_PROG(GLIB_GENMARSHAL,    glib-genmarshal)
-AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
+AC_PATH_PROG(GLIB_GENMARSHAL,         glib-genmarshal)
+AC_PATH_PROG(GDK_PIXBUF_CSOURCE,      gdk-pixbuf-csource)
+AC_PATH_PROG(UPDATE_MIME_DATABASE,    update-mime-database)
+AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database)
 
+dnl ---------------------------------------------------------------------------
+dnl - LIBGLABELS branch
+dnl ---------------------------------------------------------------------------
+LIBGLABELS=libglabels-3.0
+AC_SUBST(LIBGLABELS)
 
 dnl ---------------------------------------------------------------------------
 dnl - LIBGLABELS API versioning
@@ -46,13 +53,12 @@ dnl    increment current, and set revision to 0.
 dnl 5. If any interfaces have been added since the last public release, then increment age.
 dnl 6. If any interfaces have been removed since the last public release, then set age
 dnl    to 0.
-LIBGLABELS_C=5
-LIBGLABELS_R=1
+LIBGLABELS_C=7
+LIBGLABELS_R=0
 LIBGLABELS_A=0
 
-LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A}
-AC_SUBST(LIBGLABELS_VERSION_INFO)
-
+LIBGLABELS_API_VERSION=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A}
+AC_SUBST(LIBGLABELS_API_VERSION)
 
 dnl ---------------------------------------------------------------------------
 dnl - Library dependencies
@@ -83,12 +89,12 @@ AC_SUBST(LIBIEC16022_REQUIRED)
 dnl ---------------------------------------------------------------------------
 dnl - GLABELS prerequisites
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(GLABELS, \
-glib-2.0 >= $GLIB_REQUIRED \
-gtk+-2.0 >= $GTK_REQUIRED \
-gconf-2.0 >= $GCONF_REQUIRED \
-libxml-2.0 >= $LIBXML_REQUIRED \
-)
+PKG_CHECK_MODULES(GLABELS, [\
+	glib-2.0 >= $GLIB_REQUIRED \
+	gtk+-2.0 >= $GTK_REQUIRED \
+	gconf-2.0 >= $GCONF_REQUIRED \
+	libxml-2.0 >= $LIBXML_REQUIRED \
+])
 
 AC_SUBST(GLABELS_CFLAGS)
 AC_SUBST(GLABELS_LIBS)
@@ -97,11 +103,11 @@ AC_SUBST(GLABELS_LIBS)
 dnl ---------------------------------------------------------------------------
 dnl - LIBGLABELS more modest prerequisites
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(LIBGLABELS, \
-glib-2.0 >= $GLIB_REQUIRED \
-gconf-2.0 >= $GCONF_REQUIRED \
-libxml-2.0 >= $LIBXML_REQUIRED \
-)
+PKG_CHECK_MODULES(LIBGLABELS, [\
+	glib-2.0 >= $GLIB_REQUIRED \
+	gconf-2.0 >= $GCONF_REQUIRED \
+	libxml-2.0 >= $LIBXML_REQUIRED \
+])
 
 AC_SUBST(LIBGLABELS_CFLAGS)
 AC_SUBST(LIBGLABELS_LIBS)
@@ -111,8 +117,7 @@ dnl ---------------------------------------------------------------------------
 dnl - Check for optional evolution data server
 dnl ---------------------------------------------------------------------------
 AC_ARG_WITH(libebook,
-	    [AC_HELP_STRING([--without-libebook],
-                            [build without Evolution Data Server support])])
+	    [AS_HELP_STRING([--without-libebook],[build without Evolution Data Server support])])
 have_libebook=no
 if test "x$with_libebook" != xno; then
 	PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2 >= $LIBEBOOK_REQUIRED,
@@ -130,8 +135,7 @@ dnl ---------------------------------------------------------------------------
 dnl - Check for optional GNU Barcode backend
 dnl ---------------------------------------------------------------------------
 AC_ARG_WITH(libbarcode,
-	    [AC_HELP_STRING([--without-libbarcode],
-                            [build without GNU Barcode support])])
+	    [AS_HELP_STRING([--without-libbarcode],[build without GNU Barcode support])])
 have_libbarcode=no
 if test "x$with_libbarcode" != xno; then
    AC_CHECK_LIB(barcode, Barcode_Create,
@@ -153,8 +157,7 @@ dnl ---------------------------------------------------------------------------
 dnl - Check for optional QRencode Barcode backend
 dnl ---------------------------------------------------------------------------
 AC_ARG_WITH(libqrencode,
-	    [AC_HELP_STRING([--without-libqrencode],
-                            [build without QR code support])])
+	    [AS_HELP_STRING([--without-libqrencode],[build without QR code support])])
 have_libqrencode=no
 if test "x$with_libqrencode" != xno; then
 	PKG_CHECK_MODULES(LIBQRENCODE, libqrencode >= $LIBQRENCODE_REQUIRED,
@@ -174,8 +177,7 @@ dnl ---------------------------------------------------------------------------
 dnl - Check for IEC16022 Barcode backend
 dnl ---------------------------------------------------------------------------
 AC_ARG_WITH(libiec16022,
-	    [AC_HELP_STRING([--without-libiec16022],
-                            [build without IEC 16022 support])])
+	    [AS_HELP_STRING([--without-libiec16022],[build without IEC 16022 support])])
 have_libiec16022=no
 if test "x$with_libiec16022" != xno; then
 	PKG_CHECK_MODULES(LIBIEC16022, libiec16022 >= $LIBIEC16022_REQUIRED,
@@ -195,8 +197,7 @@ dnl ---------------------------------------------------------------------------
 dnl - Enable deprecation testing
 dnl ---------------------------------------------------------------------------
 AC_ARG_ENABLE(deprecations,
-              [AC_HELP_STRING([--enable-deprecations],
-                              [warn about deprecated usages [default=no]])],,
+              [AS_HELP_STRING([--enable-deprecations],[warn about deprecated usages [default=no]])],,
               [enable_deprecations=no])
 
 if test "x$enable_deprecations" = "xyes"; then
@@ -211,27 +212,19 @@ fi
 
 
 dnl ---------------------------------------------------------------------------
-dnl - Is freedesktop mime dbase available?
+dnl - Disable updating of mime and desktop databases
 dnl ---------------------------------------------------------------------------
-AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
-AM_CONDITIONAL(HAVE_NEW_MIME, test x$UPDATE_MIME_DATABASE != xno)
-
-AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
-AM_CONDITIONAL(HAVE_NEWER_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
-
-AC_ARG_ENABLE(update-mimedb, AC_HELP_STRING([--disable-update-mimedb],
-              [disable the update-mime-database after install [default=no]]),,
+AC_ARG_ENABLE(update-mimedb, AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]]),,
               enable_update_mimedb=yes)
 AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
 
-AC_ARG_ENABLE(update-desktopdb, AC_HELP_STRING([--disable-update-desktopdb],
-              [disable the update-desktop-database after install [default=no]]),,
+AC_ARG_ENABLE(update-desktopdb, AS_HELP_STRING([--disable-update-desktopdb],[disable the update-desktop-database after install [default=no]]),,
               enable_update_desktopdb=yes)
 AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes)
 
 
 dnl ---------------------------------------------------------------------------
-dnl - Supported languages
+dnl - i18n support
 dnl ---------------------------------------------------------------------------
 GETTEXT_PACKAGE=glabels
 AC_SUBST(GETTEXT_PACKAGE)
@@ -243,10 +236,10 @@ AM_GLIB_GNU_GETTEXT
 dnl ---------------------------------------------------------------------------
 dnl - Makefiles, etc.
 dnl ---------------------------------------------------------------------------
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 libglabels/Makefile
-libglabels/libglabels.pc
+libglabels/${LIBGLABELS}.pc
 src/Makefile
 src/pixmaps/Makefile
 src/stock-pixmaps/Makefile
@@ -263,6 +256,7 @@ docs/Makefile
 docs/libglabels/Makefile
 glabels.spec
 ])
+AC_OUTPUT
 
 
 dnl ---------------------------------------------------------------------------
diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
index ce2a21f..0ade4ee 100644
--- a/data/desktop/Makefile.am
+++ b/data/desktop/Makefile.am
@@ -11,3 +11,13 @@ desktop_DATA = $(DESKTOP_FILES)
 EXTRA_DIST = $(DESKTOP_IN_FILES)
 
 CLEANFILES = $(DESKTOP_FILES)
+
+install-data-hook:
+if ENABLE_UPDATE_DESKTOPDB
+	$(UPDATE_DESKTOP_DATABASE)
+endif
+
+uninstall-hook:
+if ENABLE_UPDATE_DESKTOPDB
+	$(UPDATE_DESKTOP_DATABASE)
+endif
diff --git a/data/mime/Makefile.am b/data/mime/Makefile.am
index 027c102..282e184 100644
--- a/data/mime/Makefile.am
+++ b/data/mime/Makefile.am
@@ -29,25 +29,11 @@ CLEANFILES = $(keys_files) $(xml_files)
 
 install-data-hook:
 if ENABLE_UPDATE_MIMEDB
-if HAVE_NEW_MIME
 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
 endif
-endif
-if ENABLE_UPDATE_DESKTOPDB
-if HAVE_NEWER_MIME
-	$(UPDATE_DESKTOP_DATABASE) 
-endif
-endif
 
 uninstall-hook:
 if ENABLE_UPDATE_MIMEDB
-if HAVE_NEW_MIME
 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
 endif
-endif
-if ENABLE_UPDATE_DESKTOPDB
-if HAVE_NEWER_MIME
-	$(UPDATE_DESKTOP_DATABASE) 
-endif
-endif
 
diff --git a/libglabels/Makefile.am b/libglabels/Makefile.am
index 51812dd..30ae37b 100644
--- a/libglabels/Makefile.am
+++ b/libglabels/Makefile.am
@@ -1,20 +1,18 @@
-templatesdir = $(datadir)/glabels/templates
+templatesdir = $(datadir)/$(LIBGLABELS)/templates
 
 INCLUDES = \
 	$(LIBGLABELS_CFLAGS)				\
 	-DLIBGLABELS_TEMPLATE_DIR=\""$(templatesdir)"\" \
 	$(DISABLE_DEPRECATED_CFLAGS)
 
-libglabels_la_LDFLAGS=\
-        -version-info $(LIBGLABELS_VERSION_INFO) \
+libglabels_3_0_la_LDFLAGS=\
+        -version-info $(LIBGLABELS_API_VERSION) \
         $(LIBGLABELS_LIBS) \
         -no-undefined 
 
-lib_LTLIBRARIES = libglabels.la
+lib_LTLIBRARIES = libglabels-3.0.la
 
-libglabelsincludedir=$(includedir)/libglabels
-
-libglabels_la_SOURCES =		\
+libglabels_3_0_la_SOURCES =		\
 	libglabels-private.h	\
 	db.h			\
 	db.c			\
@@ -41,8 +39,14 @@ libglabels_la_SOURCES =		\
 	str.h			\
 	str.c
 
-libglabelsinclude_HEADERS = 	\
-	libglabels.h		\
+libglabels_3_0includedir=$(includedir)/$(LIBGLABELS)
+
+libglabels_3_0include_HEADERS = 	\
+	libglabels.h
+
+libglabels_3_0subincludedir=$(includedir)/$(LIBGLABELS)/libglabels
+
+libglabels_3_0subinclude_HEADERS = 	\
 	db.h                    \
 	units.h			\
 	paper.h			\
@@ -55,8 +59,8 @@ libglabelsinclude_HEADERS = 	\
 	str.h			
 
 EXTRA_DIST =			\
-	libglabels.pc.in
+	$(LIBGLABELS).pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libglabels.pc
+pkgconfig_DATA = $(LIBGLABELS).pc
 
diff --git a/libglabels/libglabels.pc.in b/libglabels/libglabels-3.0.pc.in
similarity index 66%
rename from libglabels/libglabels.pc.in
rename to libglabels/libglabels-3.0.pc.in
index c16e8f4..8c5637a 100644
--- a/libglabels/libglabels.pc.in
+++ b/libglabels/libglabels-3.0.pc.in
@@ -3,10 +3,10 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: libglabels
+Name: LIBGLABELS
 Description: GLabels Template Library
 Requires: glib-2.0 libxml-2.0
 Version: @VERSION@
-Libs: -L${libdir} -lglabels
-Cflags: -I${includedir}
+Libs: -L${libdir} -lglabels-3.0
+Cflags: -I${includedir}/libglabels-3.0
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 401ae62..2ba4c83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,7 @@ SUBDIRS= pixmaps stock-pixmaps
 bin_PROGRAMS = glabels glabels-batch
 
 INCLUDES = \
-	-I$(top_srcdir) 					\
-	-I$(top_builddir) 					\
+	-I$(top_builddir)/libglabels				\
 	$(GLABELS_CFLAGS) 					\
 	$(LIBEBOOK_CFLAGS)					\
 	$(LIBBARCODE_CFLAGS)					\
@@ -13,8 +12,8 @@ INCLUDES = \
 	$(LIBIEC16022_CFLAGS)					\
 	$(DISABLE_DEPRECATED_CFLAGS)				\
 	-DGLABELS_LOCALEDIR=\""$(datadir)/locale"\" 		\
-	-DGLABELS_BUILDER_DIR=\""$(datadir)/glabels/builder/"\"	\
 	-DGLABELS_ICON_DIR=\""$(datadir)/pixmaps/"\"		\
+	-DGLABELS_BUILDER_DIR=\""$(datadir)/glabels/builder/"\"	\
 	-DGLABELS_PIXMAP_DIR=\""$(datadir)/pixmaps/glabels/"\"	\
 	-DG_LOG_DOMAIN=\""glabels\""
 
@@ -22,7 +21,7 @@ glabels_LDFLAGS = -export-dynamic
 
 glabels_LDADD = 				\
 	$(GLABELS_LIBS)				\
-	../libglabels/libglabels.la		\
+	../libglabels/$(LIBGLABELS).la		\
 	$(LIBEBOOK_LIBS)		 	\
 	$(LIBBARCODE_LIBS)		 	\
 	$(LIBQRENCODE_LIBS)			\
@@ -32,7 +31,7 @@ glabels_batch_LDFLAGS = -export-dynamic
 
 glabels_batch_LDADD = 				\
 	$(GLABELS_LIBS)				\
-	../libglabels/libglabels.la		\
+	../libglabels/$(LIBGLABELS).la		\
 	$(LIBEBOOK_LIBS)		 	\
 	$(LIBBARCODE_LIBS)		 	\
 	$(LIBQRENCODE_LIBS)			\
@@ -321,8 +320,8 @@ EXTRA_DIST = \
 
 CLEANFILES = $(BUILT_SOURCES)
 
-$(bin_PROGRAMS): ../libglabels/libglabels.la
+$(bin_PROGRAMS): ../libglabels/$(LIBGLABELS).la
 
-../libglabels/libglabels.la:
+../libglabels/$(LIBGLABELS).la:
 	cd ../libglabels; $(MAKE)
 
diff --git a/src/combo-util.c b/src/combo-util.c
index b3f5ed5..b0e3ffa 100644
--- a/src/combo-util.c
+++ b/src/combo-util.c
@@ -24,7 +24,7 @@
 
 #include <string.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 
 
 /****************************************************************************/
diff --git a/src/file.c b/src/file.c
index 5a1b78c..ca04e5f 100644
--- a/src/file.c
+++ b/src/file.c
@@ -31,7 +31,7 @@
 #include "file-util.h"
 #include "window.h"
 #include "new-label-dialog.h"
-#include "libglabels/libglabels.h"
+#include <libglabels.h>
 
 #include "debug.h"
 
diff --git a/src/font-history-model.c b/src/font-history-model.c
index 0e18b9c..0b25f05 100644
--- a/src/font-history-model.c
+++ b/src/font-history-model.c
@@ -24,7 +24,7 @@
 
 #include <gconf/gconf-client.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "font-util.h"
 #include "marshal.h"
 
diff --git a/src/font-util.c b/src/font-util.c
index 5c2391b..a9c67e9 100644
--- a/src/font-util.c
+++ b/src/font-util.c
@@ -26,7 +26,7 @@
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 
 
 /****************************************************************************/
diff --git a/src/glabels-batch.c b/src/glabels-batch.c
index bd95d51..4c6b169 100644
--- a/src/glabels-batch.c
+++ b/src/glabels-batch.c
@@ -24,7 +24,7 @@
 
 #include <math.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "merge-init.h"
 #include "template-history.h"
 #include "xml-label.h"
diff --git a/src/glabels.c b/src/glabels.c
index d3a107d..d2c7d2b 100644
--- a/src/glabels.c
+++ b/src/glabels.c
@@ -22,7 +22,7 @@
 
 #include <glib/gi18n.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "warning-handler.h"
 #include "critical-error-handler.h"
 #include "stock.h"
diff --git a/src/media-select.c b/src/media-select.c
index 8033829..bea0b00 100644
--- a/src/media-select.c
+++ b/src/media-select.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "mini-preview-pixbuf-cache.h"
 #include "prefs.h"
 #include "message-bar.h"
diff --git a/src/merge-evolution.c b/src/merge-evolution.c
index 488dd3d..a5ecd47 100644
--- a/src/merge-evolution.c
+++ b/src/merge-evolution.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 
 #include "debug.h"
 
diff --git a/src/merge.c b/src/merge.c
index f7db354..d83c4e4 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -26,7 +26,7 @@
 #include <gobject/gvaluecollector.h>
 #include <string.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 
 #include "debug.h"
 
diff --git a/src/mini-label-preview.c b/src/mini-label-preview.c
index ec78aad..d1f06c7 100644
--- a/src/mini-label-preview.c
+++ b/src/mini-label-preview.c
@@ -22,7 +22,7 @@
 
 #include "mini-label-preview.h"
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "cairo-label-path.h"
 #include "color.h"
 #include "marshal.h"
diff --git a/src/mini-preview-pixbuf-cache.c b/src/mini-preview-pixbuf-cache.c
index 82077ad..347115d 100644
--- a/src/mini-preview-pixbuf-cache.c
+++ b/src/mini-preview-pixbuf-cache.c
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 
-#include "libglabels/libglabels.h"
+#include <libglabels.h>
 #include "mini-preview-pixbuf.h"
 
 #include "debug.h"
diff --git a/src/mini-preview.c b/src/mini-preview.c
index 6ba6dde..2b7984e 100644
--- a/src/mini-preview.c
+++ b/src/mini-preview.c
@@ -24,7 +24,7 @@
 
 #include <math.h>
 
-#include "libglabels/db.h"
+#include <libglabels.h>
 #include "cairo-label-path.h"
 #include "marshal.h"
 #include "color.h"
diff --git a/src/prefs-model.c b/src/prefs-model.c
index ed83c8b..ca4537f 100644
--- a/src/prefs-model.c
+++ b/src/prefs-model.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <gconf/gconf-client.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "marshal.h"
 #include "str-util.h"
 #include "color.h"
diff --git a/src/prefs.c b/src/prefs.c
index f83e0ba..dc58f7d 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -23,7 +23,7 @@
 #include "prefs.h"
 
 #include <glib/gi18n.h>
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 
 #include "debug.h"
 
diff --git a/src/print-op.c b/src/print-op.c
index 8880dbe..71113ad 100644
--- a/src/print-op.c
+++ b/src/print-op.c
@@ -28,7 +28,7 @@
 #include <time.h>
 #include <ctype.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "print.h"
 #include "label.h"
 
diff --git a/src/print.c b/src/print.c
index 9b9da8f..be58b10 100644
--- a/src/print.c
+++ b/src/print.c
@@ -27,7 +27,7 @@
 #include <time.h>
 #include <ctype.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "label.h"
 #include "cairo-label-path.h"
 
diff --git a/src/rotate-label-button.c b/src/rotate-label-button.c
index 65a880f..d477edf 100644
--- a/src/rotate-label-button.c
+++ b/src/rotate-label-button.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <math.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "mini-label-preview.h"
 #include "hig.h"
 #include "marshal.h"
diff --git a/src/template-designer.c b/src/template-designer.c
index 675ae98..90c491c 100644
--- a/src/template-designer.c
+++ b/src/template-designer.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <math.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "prefs.h"
 #include "mini-preview.h"
 #include "mini-preview-pixbuf-cache.h"
diff --git a/src/template-history-model.c b/src/template-history-model.c
index 7d70b76..e00579e 100644
--- a/src/template-history-model.c
+++ b/src/template-history-model.c
@@ -24,7 +24,7 @@
 
 #include <gconf/gconf-client.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "marshal.h"
 
 
diff --git a/src/xml-label-04.c b/src/xml-label-04.c
index 0e2b883..7c7e297 100644
--- a/src/xml-label-04.c
+++ b/src/xml-label-04.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "label-text.h"
 #include "label-box.h"
 #include "label-line.h"
diff --git a/src/xml-label.c b/src/xml-label.c
index 2fcf165..001e33a 100644
--- a/src/xml-label.c
+++ b/src/xml-label.c
@@ -29,7 +29,7 @@
 #include <libxml/xinclude.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "label.h"
 #include "label-object.h"
 #include "label-text.h"
diff --git a/templates/Makefile.am b/templates/Makefile.am
index df138d9..abc597b 100644
--- a/templates/Makefile.am
+++ b/templates/Makefile.am
@@ -1,11 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-dtddir = $(datadir)/glabels/dtd
+dtddir = $(datadir)/$(LIBGLABELS)/dtd
 
 dtd_DATA = \
 	glabels-2.3.dtd
 
-templatesdir = $(datadir)/glabels/templates
+templatesdir = $(datadir)/$(LIBGLABELS)/templates
 
 templates_DATA = \
 	paper-sizes.xml \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]