ayatana-commits team mailing list archive

[György Balló <ballogyor@xxxxxxxxx>]

György Balló has proposed merging lp:~ballogy/libindicate/diff-dir-for-gtk3 into lp:libindicate.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ballogy/libindicate/diff-dir-for-gtk3/+merge/82846

Currently, both GTK2 and GTK3 build install header files into the same directory (/usr/include/libindicate-0.6). This causes conflict between the two package if the header files are packaged together with binaries (e.g. on Arch Linux).

This change modify the location of header files for GTK3 library.
-- 
https://code.launchpad.net/~ballogy/libindicate/diff-dir-for-gtk3/+merge/82846
Your team ayatana-commits is subscribed to branch lp:libindicate.

=== modified file 'libindicate-gtk/Makefile.am'
--- libindicate-gtk/Makefile.am	2011-08-10 18:40:09 +0000
+++ libindicate-gtk/Makefile.am	2011-11-21 07:24:23 +0000
@@ -20,7 +20,7 @@
 	indicate-gtk-0.6.pc.in \
 	indicate-gtk3-0.6.pc.in
 
-libindicate_gtkincludedir=$(includedir)/libindicate-0.6/libindicate-gtk
+libindicate_gtkincludedir=$(includedir)/libindicate$(VER)-0.6/libindicate-gtk
 
 indicate_gtk_headers = \
 	indicator.h \

=== modified file 'libindicate-gtk/indicate-gtk3-0.6.pc.in'
--- libindicate-gtk/indicate-gtk3-0.6.pc.in	2011-08-11 03:03:27 +0000
+++ libindicate-gtk/indicate-gtk3-0.6.pc.in	2011-11-21 07:24:23 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libindicate-0.6
+Cflags: -I${includedir}/libindicate3-0.6
 Requires: gtk+-3.0 indicate-0.6
 Libs: -L${libdir} -lindicate-gtk3