From b6b65c3de480c8e17c2bf9ab12196c7dde325380 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 22 Oct 2006 00:14:26 -0400 Subject: [PATCH] Add datarootdir definition for compatibility with autoconf 2.60 Signed-off-by: "Theodore Ts'o" --- ChangeLog | 5 +++++ MCONFIG.in | 1 + intl/ChangeLog | 5 +++++ intl/Makefile.in | 1 + lib/et/ChangeLog | 5 +++++ lib/et/compile_et.sh.in | 2 ++ lib/ss/ChangeLog | 5 +++++ lib/ss/mk_cmds.sh.in | 1 + po/ChangeLog | 5 +++++ po/Makefile.in.in | 1 + util/ChangeLog | 5 +++++ util/subst.conf.in | 1 + 12 files changed, 37 insertions(+) diff --git a/ChangeLog b/ChangeLog index f9556ac..b416349 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-22 Theodore Tso + + * MCONFIG.in: Add datarootdir definition for compatibility with + autoconf 2.60. + 2006-10-21 Theodore Tso * configure, configure.in: Fix -lpthread ordering so that it diff --git a/MCONFIG.in b/MCONFIG.in index a0226f5..bd327d6 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -14,6 +14,7 @@ exec_prefix = @exec_prefix@ root_bindir = @root_bindir@ root_sbindir = @root_sbindir@ root_libdir = @root_libdir@ +datarootdir = @datarootdir@ bindir = @bindir@ sbindir = @sbindir@ libdir = @libdir@ diff --git a/intl/ChangeLog b/intl/ChangeLog index 9c1604e..5db148a 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,8 @@ +2006-10-22 Theodore Tso + + * Makefile.in: Add datarootdir definition for compatibility with + autoconf 2.60. + 2006-06-30 Theodore Ts'o * Release of E2fsprogs 1.38 diff --git a/intl/Makefile.in b/intl/Makefile.in index 7662781..40a56a5 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -28,6 +28,7 @@ VPATH = $(srcdir) prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ transform = @program_transform_name@ libdir = @libdir@ includedir = @includedir@ diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog index 2f7f0a5..71dfbdf 100644 --- a/lib/et/ChangeLog +++ b/lib/et/ChangeLog @@ -1,3 +1,8 @@ +2006-10-22 Theodore Tso + + * compile_et.sh.in: Add datarootdir definition for compatibility + with autoconf 2.60. + 2006-08-05 Theodore Ts'o * compile_et.sh.in: Create the generated .c and .h files read-only diff --git a/lib/et/compile_et.sh.in b/lib/et/compile_et.sh.in index 2cc296f..c81ea1f 100644 --- a/lib/et/compile_et.sh.in +++ b/lib/et/compile_et.sh.in @@ -1,6 +1,8 @@ #!/bin/sh # # + +datarootdir=@datarootdir@ AWK=@AWK@ DIR="${DIR-@datadir@/et}" ET_DIR="@ET_DIR@" diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog index 34ec8a6..08b1f70 100644 --- a/lib/ss/ChangeLog +++ b/lib/ss/ChangeLog @@ -1,3 +1,8 @@ +2006-10-22 Theodore Tso + + * mk_cmds.sh.in: Add datarootdir definition for compatibility with + autoconf 2.60. + 2006-08-05 Theodore Tso * mk_cmds.sh.in: Create the generated .c files read-only to remind diff --git a/lib/ss/mk_cmds.sh.in b/lib/ss/mk_cmds.sh.in index af44bc5..b9a4417 100644 --- a/lib/ss/mk_cmds.sh.in +++ b/lib/ss/mk_cmds.sh.in @@ -2,6 +2,7 @@ # # +datarootdir=@datarootdir@ DIR="${DIR-@datadir@/ss}" SS_DIR="@SS_DIR@" AWK=@AWK@ diff --git a/po/ChangeLog b/po/ChangeLog index bf9d5cf..75705eb 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2006-10-22 Theodore Tso + + * Makefile.in.in: Add datarootdir definition for compatibility + with autoconf 2.60. + 2006-09-13 Theodore Tso * Update French and Dutch translations diff --git a/po/Makefile.in.in b/po/Makefile.in.in index fb5287c..25032ac 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -22,6 +22,7 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ datadir = @datadir@ localedir = $(datadir)/locale gettextsrcdir = $(datadir)/gettext/po diff --git a/util/ChangeLog b/util/ChangeLog index 59e95f4..b9ca5c5 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2006-10-22 Theodore Tso + + * subst.conf.in: Add datarootdir definition for compatibility with + autoconf 2.60. + 2006-08-05 Andreas Dilger * subst.c (main): Create automatically-generated files be diff --git a/util/subst.conf.in b/util/subst.conf.in index 7e0a1d8..d570725 100644 --- a/util/subst.conf.in +++ b/util/subst.conf.in @@ -9,6 +9,7 @@ SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@ SIZEOF_LONG @SIZEOF_LONG@ SIZEOF_INT @SIZEOF_INT@ SIZEOF_SHORT @SIZEOF_SHORT@ +datarootdir @datarootdir@ datadir @datadir@ root_sysconfdir @root_sysconfdir@ $root_prefix @root_prefix@ -- 1.8.3.1