From: Sami Kerola Date: Tue, 15 Mar 2011 20:58:07 +0000 (+0100) Subject: build-sys: do not ignore datarootdir X-Git-Tag: v2.20-rc1~426 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc3c3fdd29719883605687fc0d11391386ab46c6;p=thirdparty%2Futil-linux.git build-sys: do not ignore datarootdir Fix to the ./configure warning which has been printed since autotools version 2.59c (released at April 2006). WARNING: 'po/Makefile.in.in' seems to ignore the --datarootdir setting Signed-off-by: Sami Kerola Signed-off-by: Karel Zak --- diff --git a/autogen.sh b/autogen.sh index ae9d8c139f..a308d9b0e4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -76,6 +76,11 @@ echo " libtoolize: $(libtoolize --version | head -1)" set -e po/update-potfiles autopoint --force $AP_OPTS +if ! grep -q datarootdir po/Makefile.in.in; then + echo autopoint does not honor dataroot variable, patching. + sed -i -e 's/^datadir *=\(.*\)/datarootdir = @datarootdir@\ +datadir = @datadir@/g' po/Makefile.in.in +fi libtoolize --force $LT_OPTS aclocal -I m4 $AL_OPTS autoconf $AC_OPTS