summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoddy Shuler <roddy@endlessm.com>2018-06-22 13:53:43 +0100
committerMario Sanchez Prada <msanchez@gnome.org>2018-06-22 13:53:43 +0100
commite2efc165d10ee150d4b50a611d67241384e0deca (patch)
tree8b1529a96c9172fa5e8b8847cfad4e8b41c36856
parent9156908a3adc27774c8f1676680375d5edc1b885 (diff)
downloadgtk+-e2efc165d10ee150d4b50a611d67241384e0deca.tar.gz
modules: fix gtk-2.0 paths to gtk-3.0issue1170
Both print backends and configuration files for multipress are being installed in the wrong directory, so let's fix that.
-rw-r--r--modules/input/Makefile.am2
-rw-r--r--modules/printbackends/papi/Makefile.am2
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