[gnome-autoar] Fix include directory version prefix



commit d307bc0d7e656ad3ecaa16ee30ef86db53fea3de
Author: Ernestas Kulik <ernestask src gnome org>
Date:   Tue Aug 23 20:54:33 2016 +0300

    Fix include directory version prefix
    
    The headers were being installed in $(includedir)/gnome-autoar-<API
    version>, which breaks compatibility with the old structure
    (gnome-autoar/gnome-autoar.h becomes gnome-autoar-0/gnome-autoar.h).

 Makefile.am                         |    2 +-
 gnome-autoar/gnome-autoar-gtk.pc.in |    2 +-
 gnome-autoar/gnome-autoar.pc.in     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d12d296..efb40a5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,7 @@ lib_LTLIBRARIES = gnome-autoar/libgnome-autoar-@LIBGNOME_AUTOAR_API_VERSION@.la
 pkgconfigdir = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA = gnome-autoar/gnome-autoar-$(LIBGNOME_AUTOAR_API_VERSION).pc
 
-autoarincludedir = $(includedir)/gnome-autoar-$(LIBGNOME_AUTOAR_API_VERSION)
+autoarincludedir = $(includedir)/gnome-autoar-$(LIBGNOME_AUTOAR_API_VERSION)/gnome-autoar
 autoarinclude_HEADERS = \
        gnome-autoar/gnome-autoar.h             \
        $(libgnome_autoar_la_headers)           \
diff --git a/gnome-autoar/gnome-autoar-gtk.pc.in b/gnome-autoar/gnome-autoar-gtk.pc.in
index 3240a8f..8fee615 100644
--- a/gnome-autoar/gnome-autoar-gtk.pc.in
+++ b/gnome-autoar/gnome-autoar-gtk.pc.in
@@ -8,4 +8,4 @@ Description: GTK+ widgets for gnome-autoar library
 Version: @VERSION@
 Requires: gtk+-3.0
 Libs: -L${libdir} -lgnome-autoar-gtk-@LIBGNOME_AUTOAR_API_VERSION@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/gnome-autoar-@LIBGNOME_AUTOAR_API_VERSION@
diff --git a/gnome-autoar/gnome-autoar.pc.in b/gnome-autoar/gnome-autoar.pc.in
index b528360..de61dea 100644
--- a/gnome-autoar/gnome-autoar.pc.in
+++ b/gnome-autoar/gnome-autoar.pc.in
@@ -8,4 +8,4 @@ Description: Archives integration support for GNOME
 Version: @VERSION@
 Requires: gio-2.0 gobject-2.0 glib-2.0 @GNOME_AUTOAR_LIBARCHIVE_REQUIRES@
 Libs: -L${libdir} -lgnome-autoar-@LIBGNOME_AUTOAR_API_VERSION@ @GNOME_AUTOAR_LIBARCHIVE_LIBS@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/gnome-autoar-@LIBGNOME_AUTOAR_API_VERSION@


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]