From 21da4a54545cd6871d1d888566ce9fe488afef67 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Tue, 29 Jul 2014 16:30:37 +0200 Subject: [PATCH] Revert "configure.ac: generate Makevars in the correct directory even with out-of-tree build" This reverts commit dd37d2bc07f839cd3c74b02e713ffc6534af71b2. This breaks make distcheck. Looking at this commit I really wonder if it does anything good. It seems to work for po_makefile_in. It also breaks for distcheck which is using out of tree builds in the _build folder. If someone can explain me why something like this is needed for makevars I want to hear it. getting a fix in that does not break distcheck would be fine I guess. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1cbc698d69..eaf7295b0f 100644 --- a/configure.ac +++ b/configure.ac @@ -242,14 +242,14 @@ AM_GNU_GETTEXT_VERSION([0.17]) m4_ifdef([AC_GNU_GETTEXT], [ AC_GNU_GETTEXT([external]) po_makefile_in=po/Makefile.in -po_makevars="${srcdir}/po/Makevars:po/Makevars.in" +po_makevars=po/Makevars have_po="yes" ], [ m4_ifdef([AM_GNU_GETTEXT], [ AM_GNU_GETTEXT([external]) po_makefile_in=po/Makefile.in -po_makevars="${srcdir}/po/Makevars:po/Makevars.in" +po_makevars=po/Makevars have_po="yes" ], [