Merge branch 'issue1170' into 'gtk-3-24'

modules: fix gtk-2.0 paths to gtk-3.0

See merge request GNOME/gtk!211
This commit is contained in:
Matthias Clasen 2018-06-25 21:13:24 +00:00
commit 03c1c604dd
2 changed files with 2 additions and 2 deletions

View File

@ -191,7 +191,7 @@ WAYLAND_MODULE = im-wayland.la
endif
endif
multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-3.0"\"
im_multipress_la_CPPFLAGS = $(AM_CPPFLAGS) $(multipress_defs)
libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)

View File

@ -14,7 +14,7 @@ LDADDS = \
$(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS)
backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-papi.la