From aab7f7ace8838803f984599f0cba400d15059be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= Date: Sat, 22 Jul 2017 14:07:04 +0300 Subject: fix locale dir Commit 4feb96726f014270a6ae4f9ed29342ad53462d7f ported libwnck to upstream gettext, but was still using $DATADIRNAME that was no longer substituded with correct directory. --- configure.ac | 5 ----- libwnck/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 5935844..87e252a 100644 --- a/configure.ac +++ b/configure.ac @@ -75,11 +75,6 @@ GETTEXT_PACKAGE=libwnck-3.0 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Package name]) -# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME -# this is the directory where the *.{mo,gmo} files are installed -wncklocaledir='${prefix}/${DATADIRNAME}/locale' -AC_SUBST(wncklocaledir) - AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources]) AC_PATH_PROG(PKG_CONFIG, pkg-config) diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am index 5c025cc..6b6c7f8 100644 --- a/libwnck/Makefile.am +++ b/libwnck/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -DWNCK_I_KNOW_THIS_IS_UNSTABLE \ - -DWNCK_LOCALEDIR=\"$(wncklocaledir)\" \ + -DWNCK_LOCALEDIR=\"$(localedir)\" \ $(DISABLE_DEPRECATED_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) -- cgit v0.12