diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-06-25 21:13:24 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-06-25 21:13:24 +0000 |
| commit | 03c1c604dd64b589fd6c21473b1f8148c763d8dc (patch) | |
| tree | af599aba19fd8dbb6eaa50ca593cb975ff36b612 | |
| parent | 504574b6be56e4ea80ca813825daee6979cdc144 (diff) | |
| parent | e2efc165d10ee150d4b50a611d67241384e0deca (diff) | |
| download | gtk+-03c1c604dd64b589fd6c21473b1f8148c763d8dc.tar.gz | |
Merge branch 'issue1170' into 'gtk-3-24'
modules: fix gtk-2.0 paths to gtk-3.0
See merge request GNOME/gtk!211
| -rw-r--r-- | modules/input/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/printbackends/papi/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 34c5f38507..bf6c1a11bd 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -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) diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am index 7176eba2dd..1390784b8f 100644 --- a/modules/printbackends/papi/Makefile.am +++ b/modules/printbackends/papi/Makefile.am @@ -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 |