Re: [PATCH] build-sys: do not ignore datarootdir

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Mar 15, 2011 at 09:58:07PM +0100, Sami Kerola wrote:
> 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

Does anyone understand why autopoint generates so untidy Makefiles?

> Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
> ---
>  autogen.sh |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)

Applied with a small change (see below), thanks.

    Karel

>From cc3c3fdd29719883605687fc0d11391386ab46c6 Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@xxxxxx>
Date: Tue, 15 Mar 2011 21:58:07 +0100
Subject: [PATCH] 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 <kerolasa@xxxxxx>
Signed-off-by: Karel Zak <kzak@xxxxxxxxxx>
---
 autogen.sh |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index ae9d8c1..a308d9b 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
-- 
1.7.3.4


--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux